Revert Adb_box removal plus some fixes