Resolve save/load bugfixes