Add a couple of places where we can default to using default-registry