Improvements to PublicHD provider code