Fix warn-before-save logic in phase 2