Tweaked makefile some more