Another build fix; the dust should be settled now.