Fixes for broken stuff after the editor changes.