Issue/editor issues

Fixes for #493 and #497.