Build3 fixes and updates