Also fix the compiler warnings produced by this change.
Attach a file by drag & drop or click to upload
