Fixing a bug in fakezk creation from json.
Fixing typo.
Merge branch 'master' into replication