(OSX) Some Makefile fixes