fix compiler warnings
Merge pull request #6142 from smuzaffar/53x-warnings-l1

fix compiler warnings