Cleanups for ecpg, as well as a missing patch so that its configured in
Attach a file by drag & drop or click to upload
