Various Fixes Mainly to ADT/CPAD Companions

See specific commit messages for details.