[62] Avoid unnecessary updates exiting an edit

* Also added some compiler directives to avoid platform-specific
warnings