Removed compilation warnings

I have updated the code to removed several compilation warnings.