Fixes build on some platforms, fixes issues on others.
Attach a file by drag & drop or click to upload
