Fix leaking variables in Toolbar