More saving/loading improvements