Making the secret key source a bit more robust for existing installations