A number of small bug fixes.

Paths corrected for certain rare site setups.