Improve timestamp debug message
Reset millis in more cases to keep it in sync