[Custom]: More PubRules fixes.