Fixes some saving issues with phase 2