Fixed problems with ADT metadata