Fix latest ADT incompatibility