Various fixes for Numeric evaluation.