Deployability fixes

These are a couple of tweaks I had to make in order to stand up a new instance of restmail.net (currently running at restmail.lcip.org)