Tweaking Makefile & mocha.mk