Fixed some issues with saving/loading