Fixed handling of longs and zero time deltas.