Fixes in path utils