Fix moved spark imports