Merged in needed change to Makefile for logging