Small changes to timing and makefile to build properly on OS X.