Bunch of little bug fixes relating to load/save content.