makefile fixes and paths