Some editor fixes