Fix checkinit build

There was only one real bug, SI-8570.