Fix some makefile issues