Tweaked makefile order