Adding JsonConvertWrapper to get round JsonConvert weirdness on my machine