More  server fixes (locks up after some time)