Renewed for the new makefile
Fixed Build Bugs