Fix adb once and for all - I hope