Correct some Credential issue