minor tweaks required for hbase

Change-Id: Idb5bcb10708bcbf5fc771945598640c2a4b7a017