Fix makefile
Some tweaks