key manager bug fixes.
6 files changed