Fixed (some) bugs in serverside