Some Editor fixes