Missing a couple of bits from last patch somehow