Disney editor fixes