Update the ugly timestamp fixes for better DST detection