Port of some hobo-seed-default July enhancements