Fix some issues in Makefile
Fat commit