minor tweaks based on toolbar changes in 2.x