a couple of minor revert fixes