more fixes to support ADT verification