Server bug fixes