Timestamp format fixes