MNT: Updates to harden userpackages against lacking a connection to the data broker