Fix some loading errors