Bugfixes for new edit mode