More Bar fixes. *shame*