Added compiler directives and fixed Makefiles