Fixes to work with the expanded editor