Update Makefile

Some fixes.