Fix Integer and Numeric