Fix handling of numerics