Added several fixes to our editor restoration methods.