More pmg deprecation fixes.