Also fix warnings that show up on other compilers in test builds.
Attach a file by drag & drop or click to upload
