Final changes to Makefile for release