Updates to compile under ADT