Editor
Some fixes