Spark Core-specific changes