Minor fixes to avoid gcc8 warnings

Addresses a number of compiler warnings with gcc8

Merge request reports

Loading