Fixup creds handling