Some missing bits from 374_720