Small makefile fixes