More PGF equipment fixes