Makefile tweaks [WIP]