KeyChain bug fixes