Update path-id-checking

Updated some things in master in the interim - need to pull them in.