Fix some little nonsense to get it working on new box.
Merge pull request #5 from kevindrosendahl/misc

Fix some little nonsense to get it working on new box.