Fixes for editors and undos