Fixes Done which check while testing for 5.5

5.5 Error recorded are fixed