Changed field tag and type constants to Short.