Some changes to fvSolution to speed up solution