Fix keystore issues upon key retrieval/generation

3 jobs for v0.1.1-rc