few fixes on Server, including where we calculate the deviation time