some slot fixes
tab weirdness
Merge pull request #3211 from guardian/slot-fixes

Slot fixes