warehouse won't compile on Fedora

It looks like we need a couple of changes to get things compiling on Fedora. These commits seem to do the trick.

They have not been tested on anything else yet, so do not merge until we've tested on Ubuntu, OSX, etc.