Fix more save file load scenarios.