Some pathname fixes