Changes to reflect use by the Spark Core