Fixing prod load timing issues