Fixes to the custom RDDs for compatibility with Spark 0.7