Fixes for tabs