Fix makefile & source