minor fix and adb refactor