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