Final fixes to path adjustments