Update Makefile

Fixes to compile without my IDE build settings