Added Makefile flags so we can merge core with official