Minor bugfixes

Encountered a couple small bugs when updating our fork to Cascading 2.6 and Apache Hadoop 2.4