Minor path handler performance improvements