Minor changes
Minor fixes to make the editor work