HBASE-10413 small fixes