Fixed error with the incorrect method being called.

Minor refactorisations of adb