fix Makefile issues