[Custom]: Still more PubRules fixes.