Fixed crazy keychain issues