Fixing inconsistencies in upper level makefiles.