Time format fixes