Type save/load fix