Fixes to wf-toolbar usage