Use -v instead of -V, minor fixes