More pathname fixes