Addressing some pubrules fixes