Small changes in ExpressionSolver