Minor server bugfixes, I think this side is working for single-user setup