diff --git a/graphql.json b/graphql.json
index a4fdecc09..a4ff7b846 100644
--- a/graphql.json
+++ b/graphql.json
@@ -272,7 +272,7 @@
             "args": [],
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "Long",
               "ofType": null
             },
             "isDeprecated": false,
@@ -495,7 +495,7 @@
             "args": [],
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "Long",
               "ofType": null
             },
             "isDeprecated": false,
@@ -529,7 +529,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "SCALAR",
-                    "name": "Int",
+                    "name": "Long",
                     "ofType": null
                   }
                 },
@@ -592,7 +592,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "SCALAR",
-                    "name": "Int",
+                    "name": "Long",
                     "ofType": null
                   }
                 },
@@ -1127,7 +1127,7 @@
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "Long",
                 "ofType": null
               }
             },
@@ -1226,7 +1226,7 @@
       {
         "kind": "SCALAR",
         "name": "Long",
-        "description": "Long is a 64 bit unsigned integer.",
+        "description": "Long is a 64 bit unsigned integer. Input is accepted as either a JSON number or as a string.\nStrings may be either decimal or 0x-prefixed hexadecimal. Output values are all\n0x-prefixed hexadecimal.",
         "fields": null,
         "inputFields": null,
         "interfaces": null,
@@ -1289,7 +1289,7 @@
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "Long",
                 "ofType": null
               }
             },
@@ -1754,7 +1754,7 @@
             "args": [],
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "Long",
               "ofType": null
             },
             "isDeprecated": false,
@@ -2067,7 +2067,7 @@
             "args": [],
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "Long",
               "ofType": null
             },
             "isDeprecated": false,
diff --git a/schema.graphqls b/schema.graphqls
index aa1fdada3..8e2058010 100644
--- a/schema.graphqls
+++ b/schema.graphqls
@@ -67,7 +67,7 @@ type Block {
   TransactionCount is the number of transactions in this block. if
   transactions are not available for this block, this field will be null.
   """
-  transactionCount: Int
+  transactionCount: Long
 
   """
   StateRoot is the keccak256 hash of the state trie after this block was processed.
@@ -130,7 +130,7 @@ type Block {
   OmmerCount is the number of ommers (AKA uncles) associated with this
   block. If ommers are unavailable, this field will be null.
   """
-  ommerCount: Int
+  ommerCount: Long
 
   """
   Ommers is a list of ommer (AKA uncle) blocks associated with this block.
@@ -144,7 +144,7 @@ type Block {
   OmmerAt returns the ommer (AKA uncle) at the specified index. If ommers
   are unavailable, or the index is out of bounds, this field will be null.
   """
-  ommerAt(index: Int!): Block
+  ommerAt(index: Long!): Block
 
   """
   OmmerHash is the keccak256 hash of all the ommers (AKA uncles)
@@ -163,7 +163,7 @@ type Block {
   transactions are unavailable for this block, or if the index is out of
   bounds, this field will be null.
   """
-  transactionAt(index: Int!): Transaction
+  transactionAt(index: Long!): Transaction
 
   """Logs returns a filtered set of logs from this block."""
   logs(filter: BlockFilterCriteria!): [Log!]!
@@ -306,7 +306,7 @@ input FilterCriteria {
 """Log is an Ethereum event log."""
 type Log {
   """Index is the index of this log in the block."""
-  index: Int!
+  index: Long!
 
   """
   Account is the account which generated this log - this will always
@@ -324,7 +324,11 @@ type Log {
   transaction: Transaction!
 }
 
-"""Long is a 64 bit unsigned integer."""
+"""
+Long is a 64 bit unsigned integer. Input is accepted as either a JSON number or as a string.
+Strings may be either decimal or 0x-prefixed hexadecimal. Output values are all
+0x-prefixed hexadecimal.
+"""
 scalar Long
 
 type Mutation {
@@ -335,7 +339,7 @@ type Mutation {
 """Pending represents the current pending state."""
 type Pending {
   """TransactionCount is the number of transactions in the pending state."""
-  transactionCount: Int!
+  transactionCount: Long!
 
   """Transactions is a list of transactions in the current pending state."""
   transactions: [Transaction!]
@@ -422,7 +426,7 @@ type Transaction {
   Index is the index of this transaction in the parent block. This will
   be null if the transaction has not yet been mined.
   """
-  index: Int
+  index: Long
 
   """
   From is the account that sent this transaction - this will always be
@@ -517,7 +521,7 @@ type Transaction {
   v: BigInt!
 
   """Envelope transaction support"""
-  type: Int
+  type: Long
   accessList: [AccessTuple!]
 
   """
@@ -532,4 +536,4 @@ type Transaction {
   this is equivalent to TxType || ReceiptEncoding.
   """
   rawReceipt: Bytes!
-}
\ No newline at end of file
+}