Fix some accessors after toolbarrefactoring