Fixes for save-on-close message boxes