Fix Avro build