Attempt to fix keychain issues