Numeric conversion fixes