Various SPARK 2014 related adjustments.