armani: adb fixes?