Fixes to make the output pass pubrules.