Updates for pull request on openHatch