Hadoop/HBase changes