Fixes for toolbar editor.