Several changes from Linux
adb for Linux