Fixes for tab tracker