Fixes for the toolbar