Keyrings: Refactorings / Fixes