PATH fixes