Integrating other editor changes