Small simplification of makefile
Mac compile fixes