Improved numerics