A couple more contrib updates.