More path fixing.  Minor tweaks.