Add a few forgotten bits from previous commit