Editor update: fixes