Fixed Makefile problems