minor fixes to Makefile

There was Makefile refactoring. A lot of small things were broken.