Re: More tab fixes