Minor makefile fixes/updates

Nikos Mavrogiannopoulos requested to merge tmp-minor-fixes into master Feb 22, 2017