More fixes for tabs