Changes to the Makefile for smoother builds (says I)