VectorCalculationEngine fixes