HBASE-7583 Fixes and cleanups