Some tweaking for vdebug