Tweak use of paths