Misc fixes (structure editor, routes, etc)