Crossover errors fixes and update