Fixes for long tab names