Fix some compiler warnings reported by g++-6.3

Merge request reports

Loading