Fix some bugs. H