Makefile update

Small fixes here and there