Updates to get HBase to work