Fixes for tab settings