Fix issues with toolbars