Various editor changes