Fix freehaven.  It should be obvious what you need to do with the others from this.
Merge pull request #2 from beardy-unixer/master

Fix freehaven