Small fixes for Makefile