Misc fixes

This pull request fixes some issues I ran across while installing to a prefix in my home and trying to build out of tree work against it.