fix compiler warnings
Merge pull request #6143 from smuzaffar/53x-warnings-simulation

fix compiler warnings