More surface editor fixes