Some more bug fixes
Merge pull request #10 from jbillhei/master

Server bug fixes