Fixes on Save, Publish and Unpublish