Some minor fixes for server timestamp handling.