Fixup makefile issues