Save changes before major rebuild