Fixing keystore generation