Fix remaining editor functions