more pathname adjustments