Merge pull request #2723 from JohanMabille/warnings

Fixed warnings