Improve ShellVmDriver