more editor fixes