Fix fallout of numeric reform