Tweak some makefiles

Closes #694
Review 534 by @mlucy