fix compiler warnings
Merge pull request #6141 from smuzaffar/53x-warnings-analysis

fix compiler warnings