Fix adb and small changes here and there