Did some minor server fixes