More fixes to account for the install_directory option.