Optimization due to MathLibs changes