Shiftlight Tables/Mapswitch fixes