Fixed issues with private and public key files