Keychain and few small fixes