Fix Build Issues with ADT 22.0