Editor fixes