Few more paraview requested code fixes