some minor fixes to adb tools