Fixed dexdebug error & some sensitivity