Fixes to deal with changes in the Spark 1.0 release candidates