Fix key management interface.