Bug fixes to time server