Small changes to makefile internals