Fix for broken ADT tools