Small fixes for tabs