timing fixes
xcode build fixes
bot build fix