Fix some loading problems