Updates per tester feedback.
Merge pull request #401 from nhr/oo_install_tweaks

oo-install fixes and updates per tester feedback