Various fixes for intermittent loading problems