Fix loading errors