Fixes to BUILDING_MULTITARGET