Picking up missing commits

Somehow these got lost.