Makefile help and paths fixes