Fix loading timing errors