Extra bootstrapping now that Credentials are needed too.