Fix warnings

Reduce the number of warnings, so that we have clean Linux and Mac dashboards.