csp - crossover fixes