Changes to help hbase run at last