Fixes to ensure that it builds with the embedded server as well.
Attach a file by drag & drop or click to upload
