Fix the makefile and settings