Minor changes after upgrading avro to 1.7.4