Series of server fixes