Some path fixes.
Added an additional install path.