Interim build fix for Makefiles