Mainly makefile tweaks