Final makefile fix!