Makefile tweaks
Fix build