Studio 12.3 mods to Makefiles