Fixup creds handling
Fixup auth handling