More PATH fixes