Fixes for bbar and tabs related problems