Some quick hotfixes related to loading failure crashes