A few updates to reverse present breakage ...