Minor fixes plus private keys