Several fixes for the general editor

1 job for fix-general-editor