Some server fixes and some rage!