Various editor updates