Final pathfix