Small changes to path override