Update for -v and -dbg