Makefile fixes to make it work