Server stability improvements

[close #13]
[close #11]