Experimental hboot changes