More comment upgrades