Fix merge errors from cmds branch.

Use install_dir instead of install_version