Fix Collection -> CollectionJson compile errors