Fixing special teams