CRUNCH-409: Scrunch/Avro compatibility improvements