diff --git a/Octokit.AsyncPaginationExtension/Extensions.cs b/Octokit.AsyncPaginationExtension/Extensions.cs
index f41c07fbfe..3a4a541e6e 100644
--- a/Octokit.AsyncPaginationExtension/Extensions.cs
+++ b/Octokit.AsyncPaginationExtension/Extensions.cs
@@ -43,20 +43,20 @@ public static IPaginatedList<IssueComment> GetAllForRepositoryAsync(this IIssueC
     public static IPaginatedList<IssueComment> GetAllForRepositoryAsync(this IIssueCommentsClient t, long repositoryId, IssueCommentRequest request, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<IssueComment>(options => t.GetAllForRepository(repositoryId, request, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssueCommentsClient.GetAllForIssue(string, string, int, ApiOptions)"/>
-    public static IPaginatedList<IssueComment> GetAllForIssueAsync(this IIssueCommentsClient t, string owner, string name, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+        /// <inheritdoc cref="IIssueCommentsClient.GetAllForIssue(string, string, long, ApiOptions)"/>
+        public static IPaginatedList<IssueComment> GetAllForIssueAsync(this IIssueCommentsClient t, string owner, string name, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<IssueComment>(options => t.GetAllForIssue(owner, name, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssueCommentsClient.GetAllForIssue(long, int, ApiOptions)"/>
-    public static IPaginatedList<IssueComment> GetAllForIssueAsync(this IIssueCommentsClient t, long repositoryId, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+        /// <inheritdoc cref="IIssueCommentsClient.GetAllForIssue(long, long, ApiOptions)"/>
+        public static IPaginatedList<IssueComment> GetAllForIssueAsync(this IIssueCommentsClient t, long repositoryId, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<IssueComment>(options => t.GetAllForIssue(repositoryId, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssueCommentsClient.GetAllForIssue(string, string, int, IssueCommentRequest, ApiOptions)"/>
-    public static IPaginatedList<IssueComment> GetAllForIssueAsync(this IIssueCommentsClient t, string owner, string name, int issueNumber, IssueCommentRequest request, int pageSize = DEFAULT_PAGE_SIZE)
+        /// <inheritdoc cref="IIssueCommentsClient.GetAllForIssue(string, string, long, IssueCommentRequest, ApiOptions)"/>
+        public static IPaginatedList<IssueComment> GetAllForIssueAsync(this IIssueCommentsClient t, string owner, string name, long issueNumber, IssueCommentRequest request, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<IssueComment>(options => t.GetAllForIssue(owner, name, issueNumber, request, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssueCommentsClient.GetAllForIssue(long, int, IssueCommentRequest, ApiOptions)"/>
-    public static IPaginatedList<IssueComment> GetAllForIssueAsync(this IIssueCommentsClient t, long repositoryId, int issueNumber, IssueCommentRequest request, int pageSize = DEFAULT_PAGE_SIZE)
+        /// <inheritdoc cref="IIssueCommentsClient.GetAllForIssue(long, long, IssueCommentRequest, ApiOptions)"/>
+        public static IPaginatedList<IssueComment> GetAllForIssueAsync(this IIssueCommentsClient t, long repositoryId, long issueNumber, IssueCommentRequest request, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<IssueComment>(options => t.GetAllForIssue(repositoryId, issueNumber, request, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
     /// <inheritdoc cref="IRepositoryPagesClient.GetAll(string, string, ApiOptions)"/>
@@ -107,24 +107,24 @@ public static IPaginatedList<Notification> GetAllForRepositoryAsync(this INotifi
     public static IPaginatedList<Notification> GetAllForRepositoryAsync(this INotificationsClient t, long repositoryId, NotificationsRequest request, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<Notification>(options => t.GetAllForRepository(repositoryId, request, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssueTimelineClient.GetAllForIssue(string, string, int, ApiOptions)"/>
-    public static IPaginatedList<TimelineEventInfo> GetAllForIssueAsync(this IIssueTimelineClient t, string owner, string repo, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+    /// <inheritdoc cref="IIssueTimelineClient.GetAllForIssue(string, string, long, ApiOptions)"/>
+    public static IPaginatedList<TimelineEventInfo> GetAllForIssueAsync(this IIssueTimelineClient t, string owner, string repo, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<TimelineEventInfo>(options => t.GetAllForIssue(owner, repo, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssueTimelineClient.GetAllForIssue(long, int, ApiOptions)"/>
-    public static IPaginatedList<TimelineEventInfo> GetAllForIssueAsync(this IIssueTimelineClient t, long repositoryId, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+    /// <inheritdoc cref="IIssueTimelineClient.GetAllForIssue(long, long, ApiOptions)"/>
+    public static IPaginatedList<TimelineEventInfo> GetAllForIssueAsync(this IIssueTimelineClient t, long repositoryId, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<TimelineEventInfo>(options => t.GetAllForIssue(repositoryId, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
     /// <inheritdoc cref="IMiscellaneousClient.GetAllLicenses(ApiOptions)"/>
     public static IPaginatedList<LicenseMetadata> GetAllLicensesAsync(this IMiscellaneousClient t, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<LicenseMetadata>(t.GetAllLicenses, pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssueReactionsClient.GetAll(string, string, int, ApiOptions)"/>
-    public static IPaginatedList<Reaction> GetAllAsync(this IIssueReactionsClient t, string owner, string name, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+    /// <inheritdoc cref="IIssueReactionsClient.GetAll(string, string, long, ApiOptions)"/>
+    public static IPaginatedList<Reaction> GetAllAsync(this IIssueReactionsClient t, string owner, string name, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<Reaction>(options => t.GetAll(owner, name, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssueReactionsClient.GetAll(long, int, ApiOptions)"/>
-    public static IPaginatedList<Reaction> GetAllAsync(this IIssueReactionsClient t, long repositoryId, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+    /// <inheritdoc cref="IIssueReactionsClient.GetAll(long, long, ApiOptions)"/>
+    public static IPaginatedList<Reaction> GetAllAsync(this IIssueReactionsClient t, long repositoryId, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<Reaction>(options => t.GetAll(repositoryId, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
     /// <inheritdoc cref="IRepositoryDeployKeysClient.GetAll(string, string, ApiOptions)"/>
@@ -403,12 +403,12 @@ public static IPaginatedList<CheckRunAnnotation> GetAllAnnotationsAsync(this ICh
     public static IPaginatedList<CheckRunAnnotation> GetAllAnnotationsAsync(this ICheckRunsClient t, long repositoryId, long checkRunId, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<CheckRunAnnotation>(options => t.GetAllAnnotations(repositoryId, checkRunId, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssuesLabelsClient.GetAllForIssue(string, string, int, ApiOptions)"/>
-    public static IPaginatedList<Label> GetAllForIssueAsync(this IIssuesLabelsClient t, string owner, string name, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+    /// <inheritdoc cref="IIssuesLabelsClient.GetAllForIssue(string, string, long, ApiOptions)"/>
+    public static IPaginatedList<Label> GetAllForIssueAsync(this IIssuesLabelsClient t, string owner, string name, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<Label>(options => t.GetAllForIssue(owner, name, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssuesLabelsClient.GetAllForIssue(long, int, ApiOptions)"/>
-    public static IPaginatedList<Label> GetAllForIssueAsync(this IIssuesLabelsClient t, long repositoryId, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+    /// <inheritdoc cref="IIssuesLabelsClient.GetAllForIssue(long, long, ApiOptions)"/>
+    public static IPaginatedList<Label> GetAllForIssueAsync(this IIssuesLabelsClient t, long repositoryId, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<Label>(options => t.GetAllForIssue(repositoryId, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
     /// <inheritdoc cref="IIssuesLabelsClient.GetAllForRepository(string, string, ApiOptions)"/>
@@ -559,12 +559,12 @@ public static IPaginatedList<Reaction> GetAllAsync(this IPullRequestReviewCommen
     public static IPaginatedList<Reaction> GetAllAsync(this IPullRequestReviewCommentReactionsClient t, long repositoryId, long commentId, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<Reaction>(options => t.GetAll(repositoryId, commentId, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssuesEventsClient.GetAllForIssue(string, string, int, ApiOptions)"/>
-    public static IPaginatedList<IssueEvent> GetAllForIssueAsync(this IIssuesEventsClient t, string owner, string name, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+    /// <inheritdoc cref="IIssuesEventsClient.GetAllForIssue(string, string, long, ApiOptions)"/>
+    public static IPaginatedList<IssueEvent> GetAllForIssueAsync(this IIssuesEventsClient t, string owner, string name, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<IssueEvent>(options => t.GetAllForIssue(owner, name, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
-    /// <inheritdoc cref="IIssuesEventsClient.GetAllForIssue(long, int, ApiOptions)"/>
-    public static IPaginatedList<IssueEvent> GetAllForIssueAsync(this IIssuesEventsClient t, long repositoryId, int issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
+    /// <inheritdoc cref="IIssuesEventsClient.GetAllForIssue(long, long, ApiOptions)"/>
+    public static IPaginatedList<IssueEvent> GetAllForIssueAsync(this IIssuesEventsClient t, long repositoryId, long issueNumber, int pageSize = DEFAULT_PAGE_SIZE)
         => pageSize > 0 ? new PaginatedList<IssueEvent>(options => t.GetAllForIssue(repositoryId, issueNumber, options), pageSize) : throw new ArgumentOutOfRangeException(nameof(pageSize), pageSize, "The page size must be positive.");
 
     /// <inheritdoc cref="IIssuesEventsClient.GetAllForRepository(string, string, ApiOptions)"/>
diff --git a/Octokit.Reactive/Clients/IObservableAssigneesClient.cs b/Octokit.Reactive/Clients/IObservableAssigneesClient.cs
index a529a26fbe..4bef987b4a 100644
--- a/Octokit.Reactive/Clients/IObservableAssigneesClient.cs
+++ b/Octokit.Reactive/Clients/IObservableAssigneesClient.cs
@@ -54,7 +54,7 @@ public interface IObservableAssigneesClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="assignees">List of names of assignees to add</param>
         /// <returns></returns>
-        IObservable<Issue> AddAssignees(string owner, string name, int issueNumber, AssigneesUpdate assignees);
+        IObservable<Issue> AddAssignees(string owner, string name, long issueNumber, AssigneesUpdate assignees);
 
         /// <summary>
         /// Remove assignees from a specified Issue.
@@ -64,7 +64,7 @@ public interface IObservableAssigneesClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="assignees">List of assignees to remove </param>
         /// <returns></returns>
-        IObservable<Issue> RemoveAssignees(string owner, string name, int issueNumber, AssigneesUpdate assignees);
+        IObservable<Issue> RemoveAssignees(string owner, string name, long issueNumber, AssigneesUpdate assignees);
 
         /// <summary>
         /// Checks to see if a user is an assignee for a repository.
diff --git a/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs b/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
index 9a4e7b6354..3a474b32fb 100644
--- a/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
@@ -108,7 +108,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<IssueComment> GetAllForIssue(string owner, string name, int issueNumber);
+        IObservable<IssueComment> GetAllForIssue(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -116,7 +116,7 @@ public interface IObservableIssueCommentsClient
         /// <remarks>http://developer.github.com/v3/issues/comments/#list-comments-on-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumber);
+        IObservable<IssueComment> GetAllForIssue(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -126,7 +126,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<IssueComment> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options);
+        IObservable<IssueComment> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -135,7 +135,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options);
+        IObservable<IssueComment> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -145,7 +145,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
-        IObservable<IssueComment> GetAllForIssue(string owner, string name, int issueNumber, IssueCommentRequest request);
+        IObservable<IssueComment> GetAllForIssue(string owner, string name, long issueNumber, IssueCommentRequest request);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -154,7 +154,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
-        IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumber, IssueCommentRequest request);
+        IObservable<IssueComment> GetAllForIssue(long repositoryId, long issueNumber, IssueCommentRequest request);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -165,7 +165,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<IssueComment> GetAllForIssue(string owner, string name, int issueNumber, IssueCommentRequest request, ApiOptions options);
+        IObservable<IssueComment> GetAllForIssue(string owner, string name, long issueNumber, IssueCommentRequest request, ApiOptions options);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -175,7 +175,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumber, IssueCommentRequest request, ApiOptions options);
+        IObservable<IssueComment> GetAllForIssue(long repositoryId, long issueNumber, IssueCommentRequest request, ApiOptions options);
 
         /// <summary>
         /// Creates a new Issue Comment for a specified Issue.
@@ -185,7 +185,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="newComment">The text of the new comment</param>
-        IObservable<IssueComment> Create(string owner, string name, int issueNumber, string newComment);
+        IObservable<IssueComment> Create(string owner, string name, long issueNumber, string newComment);
 
         /// <summary>
         /// Creates a new Issue Comment for a specified Issue.
@@ -194,7 +194,7 @@ public interface IObservableIssueCommentsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="newComment">The text of the new comment</param>
-        IObservable<IssueComment> Create(long repositoryId, int issueNumber, string newComment);
+        IObservable<IssueComment> Create(long repositoryId, long issueNumber, string newComment);
 
         /// <summary>
         /// Updates a specified Issue Comment.
diff --git a/Octokit.Reactive/Clients/IObservableIssueReactionsClient.cs b/Octokit.Reactive/Clients/IObservableIssueReactionsClient.cs
index e74d84f528..aa34e902d7 100644
--- a/Octokit.Reactive/Clients/IObservableIssueReactionsClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssueReactionsClient.cs
@@ -18,7 +18,7 @@ public interface IObservableIssueReactionsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<Reaction> GetAll(string owner, string name, int issueNumber);
+        IObservable<Reaction> GetAll(string owner, string name, long issueNumber);
 
         /// <summary>
         /// List reactions for a specified Issue.
@@ -28,7 +28,7 @@ public interface IObservableIssueReactionsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<Reaction> GetAll(string owner, string name, int issueNumber, ApiOptions options);
+        IObservable<Reaction> GetAll(string owner, string name, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// List reactions for a specified Issue.
@@ -36,7 +36,7 @@ public interface IObservableIssueReactionsClient
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<Reaction> GetAll(long repositoryId, int issueNumber);
+        IObservable<Reaction> GetAll(long repositoryId, long issueNumber);
 
         /// <summary>
         /// List reactions for a specified Issue.
@@ -45,7 +45,7 @@ public interface IObservableIssueReactionsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<Reaction> GetAll(long repositoryId, int issueNumber, ApiOptions options);
+        IObservable<Reaction> GetAll(long repositoryId, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Creates a reaction for a specified Issue.
@@ -55,7 +55,7 @@ public interface IObservableIssueReactionsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reaction">The reaction to create </param>
-        IObservable<Reaction> Create(string owner, string name, int issueNumber, NewReaction reaction);
+        IObservable<Reaction> Create(string owner, string name, long issueNumber, NewReaction reaction);
 
         /// <summary>
         /// Creates a reaction for a specified Issue.
@@ -64,7 +64,7 @@ public interface IObservableIssueReactionsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reaction">The reaction to create </param>
-        IObservable<Reaction> Create(long repositoryId, int issueNumber, NewReaction reaction);
+        IObservable<Reaction> Create(long repositoryId, long issueNumber, NewReaction reaction);
 
         /// <summary>
         /// Deletes a reaction for a specified Issue
@@ -75,7 +75,7 @@ public interface IObservableIssueReactionsClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(string owner, string name, int issueNumber, long reactionId);
+        IObservable<Unit> Delete(string owner, string name, long issueNumber, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Issue
@@ -85,6 +85,6 @@ public interface IObservableIssueReactionsClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(long repositoryId, int issueNumber, long reactionId);
+        IObservable<Unit> Delete(long repositoryId, long issueNumber, long reactionId);
     }
 }
diff --git a/Octokit.Reactive/Clients/IObservableIssueTimelineClient.cs b/Octokit.Reactive/Clients/IObservableIssueTimelineClient.cs
index d9350cda20..62cbb4f27e 100644
--- a/Octokit.Reactive/Clients/IObservableIssueTimelineClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssueTimelineClient.cs
@@ -19,7 +19,7 @@ public interface IObservableIssueTimelineClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="repo">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, int issueNumber);
+        IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, long issueNumber);
 
         /// <summary>
         /// Gets all the various events that have occurred around an issue or pull request.
@@ -31,7 +31,7 @@ public interface IObservableIssueTimelineClient
         /// <param name="repo">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, int issueNumber, ApiOptions options);
+        IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all the various events that have occurred around an issue or pull request.
@@ -41,7 +41,7 @@ public interface IObservableIssueTimelineClient
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, int issueNumber);
+        IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets all the various events that have occurred around an issue or pull request.
@@ -52,6 +52,6 @@ public interface IObservableIssueTimelineClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options);
+        IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options);
     }
 }
diff --git a/Octokit.Reactive/Clients/IObservableIssuesClient.cs b/Octokit.Reactive/Clients/IObservableIssuesClient.cs
index f96d6ffc9d..8a4189eb7a 100644
--- a/Octokit.Reactive/Clients/IObservableIssuesClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssuesClient.cs
@@ -60,7 +60,7 @@ public interface IObservableIssuesClient
         /// <param name="issueNumber">The issue number</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        IObservable<Issue> Get(string owner, string name, int issueNumber);
+        IObservable<Issue> Get(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Gets a single Issue by number.
@@ -72,7 +72,7 @@ public interface IObservableIssuesClient
         /// <param name="issueNumber">The issue number</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        IObservable<Issue> Get(long repositoryId, int issueNumber);
+        IObservable<Issue> Get(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets all open issues assigned to the authenticated user across all the authenticated user’s visible
@@ -309,7 +309,7 @@ public interface IObservableIssuesClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
-        IObservable<Issue> Update(string owner, string name, int issueNumber, IssueUpdate issueUpdate);
+        IObservable<Issue> Update(string owner, string name, long issueNumber, IssueUpdate issueUpdate);
 
         /// <summary>
         /// Creates an issue for the specified repository. Any user with pull access to a repository can create an
@@ -320,6 +320,6 @@ public interface IObservableIssuesClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
-        IObservable<Issue> Update(long repositoryId, int issueNumber, IssueUpdate issueUpdate);
+        IObservable<Issue> Update(long repositoryId, long issueNumber, IssueUpdate issueUpdate);
     }
 }
diff --git a/Octokit.Reactive/Clients/IObservableIssuesEventsClient.cs b/Octokit.Reactive/Clients/IObservableIssuesEventsClient.cs
index ed718222ca..18cdb864f6 100644
--- a/Octokit.Reactive/Clients/IObservableIssuesEventsClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssuesEventsClient.cs
@@ -20,7 +20,7 @@ public interface IObservableIssuesEventsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<IssueEvent> GetAllForIssue(string owner, string name, int issueNumber);
+        IObservable<IssueEvent> GetAllForIssue(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Gets all events for the issue.
@@ -30,7 +30,7 @@ public interface IObservableIssuesEventsClient
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<IssueEvent> GetAllForIssue(long repositoryId, int issueNumber);
+        IObservable<IssueEvent> GetAllForIssue(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets all events for the issue.
@@ -42,7 +42,7 @@ public interface IObservableIssuesEventsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<IssueEvent> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options);
+        IObservable<IssueEvent> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all events for the issue.
@@ -53,7 +53,7 @@ public interface IObservableIssuesEventsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<IssueEvent> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options);
+        IObservable<IssueEvent> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all events for the repository.
diff --git a/Octokit.Reactive/Clients/IObservableIssuesLabelsClient.cs b/Octokit.Reactive/Clients/IObservableIssuesLabelsClient.cs
index c18e513876..6fd2921e80 100644
--- a/Octokit.Reactive/Clients/IObservableIssuesLabelsClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssuesLabelsClient.cs
@@ -21,7 +21,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<Label> GetAllForIssue(string owner, string name, int issueNumber);
+        IObservable<Label> GetAllForIssue(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Gets all  labels for the issue.
@@ -31,7 +31,7 @@ public interface IObservableIssuesLabelsClient
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<Label> GetAllForIssue(long repositoryId, int issueNumber);
+        IObservable<Label> GetAllForIssue(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets all  labels for the issue.
@@ -43,7 +43,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<Label> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options);
+        IObservable<Label> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all  labels for the issue.
@@ -54,7 +54,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<Label> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options);
+        IObservable<Label> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all  labels for the repository.
@@ -240,7 +240,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labels">The names of the labels to add</param>
-        IObservable<Label> AddToIssue(string owner, string name, int issueNumber, string[] labels);
+        IObservable<Label> AddToIssue(string owner, string name, long issueNumber, string[] labels);
 
         /// <summary>
         /// Adds a label to an issue
@@ -251,7 +251,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labels">The names of the labels to add</param>
-        IObservable<Label> AddToIssue(long repositoryId, int issueNumber, string[] labels);
+        IObservable<Label> AddToIssue(long repositoryId, long issueNumber, string[] labels);
 
         /// <summary>
         /// Removes a label from an issue
@@ -263,7 +263,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labelName">The name of the label to remove</param>
-        IObservable<Label> RemoveFromIssue(string owner, string name, int issueNumber, string labelName);
+        IObservable<Label> RemoveFromIssue(string owner, string name, long issueNumber, string labelName);
 
         /// <summary>
         /// Removes a label from an issue
@@ -274,7 +274,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labelName">The name of the label to remove</param>
-        IObservable<Label> RemoveFromIssue(long repositoryId, int issueNumber, string labelName);
+        IObservable<Label> RemoveFromIssue(long repositoryId, long issueNumber, string labelName);
 
         /// <summary>
         /// Replaces all labels on the specified issues with the provided labels
@@ -286,7 +286,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labels">The names of the labels to set</param>
-        IObservable<Label> ReplaceAllForIssue(string owner, string name, int issueNumber, string[] labels);
+        IObservable<Label> ReplaceAllForIssue(string owner, string name, long issueNumber, string[] labels);
 
         /// <summary>
         /// Replaces all labels on the specified issues with the provided labels
@@ -297,7 +297,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labels">The names of the labels to set</param>
-        IObservable<Label> ReplaceAllForIssue(long repositoryId, int issueNumber, string[] labels);
+        IObservable<Label> ReplaceAllForIssue(long repositoryId, long issueNumber, string[] labels);
 
         /// <summary>
         /// Removes all labels from an issue
@@ -308,7 +308,7 @@ public interface IObservableIssuesLabelsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<Unit> RemoveAllFromIssue(string owner, string name, int issueNumber);
+        IObservable<Unit> RemoveAllFromIssue(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Removes all labels from an issue
@@ -318,6 +318,6 @@ public interface IObservableIssuesLabelsClient
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<Unit> RemoveAllFromIssue(long repositoryId, int issueNumber);
+        IObservable<Unit> RemoveAllFromIssue(long repositoryId, long issueNumber);
     }
 }
diff --git a/Octokit.Reactive/Clients/IObservableLockUnlockClient.cs b/Octokit.Reactive/Clients/IObservableLockUnlockClient.cs
index 8c57b1507d..e168bbef2d 100644
--- a/Octokit.Reactive/Clients/IObservableLockUnlockClient.cs
+++ b/Octokit.Reactive/Clients/IObservableLockUnlockClient.cs
@@ -16,7 +16,7 @@ public interface IObservableLockUnlockClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="lockReason">The reason for locking the issue</param>
-        IObservable<Unit> Lock(string owner, string name, int issueNumber, LockReason? lockReason = null);
+        IObservable<Unit> Lock(string owner, string name, long issueNumber, LockReason? lockReason = null);
 
         /// <summary>
         /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
@@ -25,7 +25,7 @@ public interface IObservableLockUnlockClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="lockReason">The reason for locking the issue</param>
-        IObservable<Unit> Lock(long repositoryId, int issueNumber, LockReason? lockReason = null);
+        IObservable<Unit> Lock(long repositoryId, long issueNumber, LockReason? lockReason = null);
 
         /// <summary>
         /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
@@ -34,7 +34,7 @@ public interface IObservableLockUnlockClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<Unit> Unlock(string owner, string name, int issueNumber);
+        IObservable<Unit> Unlock(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
@@ -42,6 +42,6 @@ public interface IObservableLockUnlockClient
         /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        IObservable<Unit> Unlock(long repositoryId, int issueNumber);
+        IObservable<Unit> Unlock(long repositoryId, long issueNumber);
     }
 }
diff --git a/Octokit.Reactive/Clients/ObservableAssigneesClient.cs b/Octokit.Reactive/Clients/ObservableAssigneesClient.cs
index 827942fbb0..606ecc3f8a 100644
--- a/Octokit.Reactive/Clients/ObservableAssigneesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableAssigneesClient.cs
@@ -94,7 +94,7 @@ public IObservable<bool> CheckAssignee(string owner, string name, string assigne
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="assignees">List of names of assignees to add</param>
-        public IObservable<Issue> AddAssignees(string owner, string name, int issueNumber, AssigneesUpdate assignees)
+        public IObservable<Issue> AddAssignees(string owner, string name, long issueNumber, AssigneesUpdate assignees)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -111,7 +111,7 @@ public IObservable<Issue> AddAssignees(string owner, string name, int issueNumbe
         /// <param name="issueNumber">The issue number</param>
         /// <param name="assignees">List of assignees to remove </param>
         /// <returns></returns>
-        public IObservable<Issue> RemoveAssignees(string owner, string name, int issueNumber, AssigneesUpdate assignees)
+        public IObservable<Issue> RemoveAssignees(string owner, string name, long issueNumber, AssigneesUpdate assignees)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
diff --git a/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs b/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
index 0a882002a7..9b30647ed4 100644
--- a/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
@@ -172,7 +172,7 @@ public IObservable<IssueComment> GetAllForRepository(long repositoryId, IssueCom
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<IssueComment> GetAllForIssue(string owner, string name, int issueNumber)
+        public IObservable<IssueComment> GetAllForIssue(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -186,7 +186,7 @@ public IObservable<IssueComment> GetAllForIssue(string owner, string name, int i
         /// <remarks>http://developer.github.com/v3/issues/comments/#list-comments-on-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumber)
+        public IObservable<IssueComment> GetAllForIssue(long repositoryId, long issueNumber)
         {
             return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -199,7 +199,7 @@ public IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumb
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<IssueComment> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options)
+        public IObservable<IssueComment> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -215,7 +215,7 @@ public IObservable<IssueComment> GetAllForIssue(string owner, string name, int i
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
+        public IObservable<IssueComment> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
@@ -230,7 +230,7 @@ public IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumb
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
-        public IObservable<IssueComment> GetAllForIssue(string owner, string name, int issueNumber, IssueCommentRequest request)
+        public IObservable<IssueComment> GetAllForIssue(string owner, string name, long issueNumber, IssueCommentRequest request)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -246,7 +246,7 @@ public IObservable<IssueComment> GetAllForIssue(string owner, string name, int i
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
-        public IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumber, IssueCommentRequest request)
+        public IObservable<IssueComment> GetAllForIssue(long repositoryId, long issueNumber, IssueCommentRequest request)
         {
             Ensure.ArgumentNotNull(request, nameof(request));
 
@@ -262,7 +262,7 @@ public IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumb
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<IssueComment> GetAllForIssue(string owner, string name, int issueNumber, IssueCommentRequest request, ApiOptions options)
+        public IObservable<IssueComment> GetAllForIssue(string owner, string name, long issueNumber, IssueCommentRequest request, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -281,7 +281,7 @@ public IObservable<IssueComment> GetAllForIssue(string owner, string name, int i
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumber, IssueCommentRequest request, ApiOptions options)
+        public IObservable<IssueComment> GetAllForIssue(long repositoryId, long issueNumber, IssueCommentRequest request, ApiOptions options)
         {
             Ensure.ArgumentNotNull(request, nameof(request));
             Ensure.ArgumentNotNull(options, nameof(options));
@@ -297,7 +297,7 @@ public IObservable<IssueComment> GetAllForIssue(long repositoryId, int issueNumb
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="newComment">The text of the new comment</param>
-        public IObservable<IssueComment> Create(string owner, string name, int issueNumber, string newComment)
+        public IObservable<IssueComment> Create(string owner, string name, long issueNumber, string newComment)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -313,7 +313,7 @@ public IObservable<IssueComment> Create(string owner, string name, int issueNumb
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="newComment">The text of the new comment</param>
-        public IObservable<IssueComment> Create(long repositoryId, int issueNumber, string newComment)
+        public IObservable<IssueComment> Create(long repositoryId, long issueNumber, string newComment)
         {
             Ensure.ArgumentNotNull(newComment, nameof(newComment));
 
diff --git a/Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs b/Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs
index a0bee5aa99..fc23b6f89c 100644
--- a/Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs
@@ -31,7 +31,7 @@ public ObservableIssueReactionsClient(IGitHubClient client)
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Reaction> GetAll(string owner, string name, int issueNumber)
+        public IObservable<Reaction> GetAll(string owner, string name, long issueNumber)
         {
             return GetAll(owner, name, issueNumber, ApiOptions.None);
         }
@@ -44,7 +44,7 @@ public IObservable<Reaction> GetAll(string owner, string name, int issueNumber)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<Reaction> GetAll(string owner, string name, int issueNumber, ApiOptions options)
+        public IObservable<Reaction> GetAll(string owner, string name, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -59,7 +59,7 @@ public IObservable<Reaction> GetAll(string owner, string name, int issueNumber,
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Reaction> GetAll(long repositoryId, int issueNumber)
+        public IObservable<Reaction> GetAll(long repositoryId, long issueNumber)
         {
             return GetAll(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -71,7 +71,7 @@ public IObservable<Reaction> GetAll(long repositoryId, int issueNumber)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<Reaction> GetAll(long repositoryId, int issueNumber, ApiOptions options)
+        public IObservable<Reaction> GetAll(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
@@ -86,7 +86,7 @@ public IObservable<Reaction> GetAll(long repositoryId, int issueNumber, ApiOptio
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reaction">The reaction to create</param>
-        public IObservable<Reaction> Create(string owner, string name, int issueNumber, NewReaction reaction)
+        public IObservable<Reaction> Create(string owner, string name, long issueNumber, NewReaction reaction)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -102,7 +102,7 @@ public IObservable<Reaction> Create(string owner, string name, int issueNumber,
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reaction">The reaction to create </param>
-        public IObservable<Reaction> Create(long repositoryId, int issueNumber, NewReaction reaction)
+        public IObservable<Reaction> Create(long repositoryId, long issueNumber, NewReaction reaction)
         {
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
@@ -118,7 +118,7 @@ public IObservable<Reaction> Create(long repositoryId, int issueNumber, NewReact
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(string owner, string name, int issueNumber, long reactionId)
+        public IObservable<Unit> Delete(string owner, string name, long issueNumber, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -135,7 +135,7 @@ public IObservable<Unit> Delete(string owner, string name, int issueNumber, long
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(long repositoryId, int issueNumber, long reactionId)
+        public IObservable<Unit> Delete(long repositoryId, long issueNumber, long reactionId)
         {
             Ensure.ArgumentNotNull(reactionId, nameof(reactionId));
 
diff --git a/Octokit.Reactive/Clients/ObservableIssueTimelineClient.cs b/Octokit.Reactive/Clients/ObservableIssueTimelineClient.cs
index 9eccc78e1a..2aee16df87 100644
--- a/Octokit.Reactive/Clients/ObservableIssueTimelineClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueTimelineClient.cs
@@ -29,7 +29,7 @@ public ObservableIssueTimelineClient(IGitHubClient client)
         /// <param name="owner">The owner of the repository</param>
         /// <param name="repo">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, int issueNumber)
+        public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
@@ -47,7 +47,7 @@ public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo,
         /// <param name="repo">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, int issueNumber, ApiOptions options)
+        public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
@@ -64,7 +64,7 @@ public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo,
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, int issueNumber)
+        public IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, long issueNumber)
         {
             return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -78,7 +78,7 @@ public IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, int issu
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
+        public IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
diff --git a/Octokit.Reactive/Clients/ObservableIssuesClient.cs b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
index 1680702a59..7b5f16a10d 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
@@ -77,7 +77,7 @@ public ObservableIssuesClient(IGitHubClient client)
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Issue> Get(string owner, string name, int issueNumber)
+        public IObservable<Issue> Get(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -93,7 +93,7 @@ public IObservable<Issue> Get(string owner, string name, int issueNumber)
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Issue> Get(long repositoryId, int issueNumber)
+        public IObservable<Issue> Get(long repositoryId, long issueNumber)
         {
             return _client.Get(repositoryId, issueNumber).ToObservable();
         }
@@ -454,7 +454,7 @@ public IObservable<Issue> Create(long repositoryId, NewIssue newIssue)
         /// <param name="issueNumber">The issue number</param>
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
-        public IObservable<Issue> Update(string owner, string name, int issueNumber, IssueUpdate issueUpdate)
+        public IObservable<Issue> Update(string owner, string name, long issueNumber, IssueUpdate issueUpdate)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -472,7 +472,7 @@ public IObservable<Issue> Update(string owner, string name, int issueNumber, Iss
         /// <param name="issueNumber">The issue number</param>
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
-        public IObservable<Issue> Update(long repositoryId, int issueNumber, IssueUpdate issueUpdate)
+        public IObservable<Issue> Update(long repositoryId, long issueNumber, IssueUpdate issueUpdate)
         {
             Ensure.ArgumentNotNull(issueUpdate, nameof(issueUpdate));
 
diff --git a/Octokit.Reactive/Clients/ObservableIssuesEventsClient.cs b/Octokit.Reactive/Clients/ObservableIssuesEventsClient.cs
index 952744ae2f..ce1fe7a890 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesEventsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesEventsClient.cs
@@ -32,7 +32,7 @@ public ObservableIssuesEventsClient(IGitHubClient client)
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<IssueEvent> GetAllForIssue(string owner, string name, int issueNumber)
+        public IObservable<IssueEvent> GetAllForIssue(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -48,7 +48,7 @@ public IObservable<IssueEvent> GetAllForIssue(string owner, string name, int iss
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<IssueEvent> GetAllForIssue(long repositoryId, int issueNumber)
+        public IObservable<IssueEvent> GetAllForIssue(long repositoryId, long issueNumber)
         {
             return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -63,7 +63,7 @@ public IObservable<IssueEvent> GetAllForIssue(long repositoryId, int issueNumber
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<IssueEvent> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options)
+        public IObservable<IssueEvent> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -81,7 +81,7 @@ public IObservable<IssueEvent> GetAllForIssue(string owner, string name, int iss
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<IssueEvent> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
+        public IObservable<IssueEvent> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
diff --git a/Octokit.Reactive/Clients/ObservableIssuesLabelsClient.cs b/Octokit.Reactive/Clients/ObservableIssuesLabelsClient.cs
index 244f10fefe..9354f2e759 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesLabelsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesLabelsClient.cs
@@ -34,7 +34,7 @@ public ObservableIssuesLabelsClient(IGitHubClient client)
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Label> GetAllForIssue(string owner, string name, int issueNumber)
+        public IObservable<Label> GetAllForIssue(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -50,7 +50,7 @@ public IObservable<Label> GetAllForIssue(string owner, string name, int issueNum
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Label> GetAllForIssue(long repositoryId, int issueNumber)
+        public IObservable<Label> GetAllForIssue(long repositoryId, long issueNumber)
         {
             return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -65,7 +65,7 @@ public IObservable<Label> GetAllForIssue(long repositoryId, int issueNumber)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<Label> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options)
+        public IObservable<Label> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -83,7 +83,7 @@ public IObservable<Label> GetAllForIssue(string owner, string name, int issueNum
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<Label> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
+        public IObservable<Label> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
@@ -362,7 +362,7 @@ public IObservable<Label> Update(long repositoryId, string labelName, LabelUpdat
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labels">The names of the labels to add</param>
-        public IObservable<Label> AddToIssue(string owner, string name, int issueNumber, string[] labels)
+        public IObservable<Label> AddToIssue(string owner, string name, long issueNumber, string[] labels)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -382,7 +382,7 @@ public IObservable<Label> AddToIssue(string owner, string name, int issueNumber,
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labels">The names of the labels to add</param>
-        public IObservable<Label> AddToIssue(long repositoryId, int issueNumber, string[] labels)
+        public IObservable<Label> AddToIssue(long repositoryId, long issueNumber, string[] labels)
         {
             Ensure.ArgumentNotNull(labels, nameof(labels));
 
@@ -401,7 +401,7 @@ public IObservable<Label> AddToIssue(long repositoryId, int issueNumber, string[
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labelName">The name of the label to remove</param>
-        public IObservable<Label> RemoveFromIssue(string owner, string name, int issueNumber, string labelName)
+        public IObservable<Label> RemoveFromIssue(string owner, string name, long issueNumber, string labelName)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -421,7 +421,7 @@ public IObservable<Label> RemoveFromIssue(string owner, string name, int issueNu
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labelName">The name of the label to remove</param>
-        public IObservable<Label> RemoveFromIssue(long repositoryId, int issueNumber, string labelName)
+        public IObservable<Label> RemoveFromIssue(long repositoryId, long issueNumber, string labelName)
         {
             Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
@@ -440,7 +440,7 @@ public IObservable<Label> RemoveFromIssue(long repositoryId, int issueNumber, st
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labels">The names of the labels to set</param>
-        public IObservable<Label> ReplaceAllForIssue(string owner, string name, int issueNumber, string[] labels)
+        public IObservable<Label> ReplaceAllForIssue(string owner, string name, long issueNumber, string[] labels)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -460,7 +460,7 @@ public IObservable<Label> ReplaceAllForIssue(string owner, string name, int issu
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labels">The names of the labels to set</param>
-        public IObservable<Label> ReplaceAllForIssue(long repositoryId, int issueNumber, string[] labels)
+        public IObservable<Label> ReplaceAllForIssue(long repositoryId, long issueNumber, string[] labels)
         {
             Ensure.ArgumentNotNull(labels, nameof(labels));
 
@@ -478,7 +478,7 @@ public IObservable<Label> ReplaceAllForIssue(long repositoryId, int issueNumber,
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Unit> RemoveAllFromIssue(string owner, string name, int issueNumber)
+        public IObservable<Unit> RemoveAllFromIssue(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -494,7 +494,7 @@ public IObservable<Unit> RemoveAllFromIssue(string owner, string name, int issue
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Unit> RemoveAllFromIssue(long repositoryId, int issueNumber)
+        public IObservable<Unit> RemoveAllFromIssue(long repositoryId, long issueNumber)
         {
             return _client.RemoveAllFromIssue(repositoryId, issueNumber).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableLockUnlockClient.cs b/Octokit.Reactive/Clients/ObservableLockUnlockClient.cs
index 3a4cc4ceb0..a06d069786 100644
--- a/Octokit.Reactive/Clients/ObservableLockUnlockClient.cs
+++ b/Octokit.Reactive/Clients/ObservableLockUnlockClient.cs
@@ -26,7 +26,7 @@ public ObservableLockUnlockClient(IGitHubClient client)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="lockReason">The reason for locking the issue</param>
-        public IObservable<Unit> Lock(string owner, string name, int issueNumber, LockReason? lockReason = null)
+        public IObservable<Unit> Lock(string owner, string name, long issueNumber, LockReason? lockReason = null)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -41,7 +41,7 @@ public IObservable<Unit> Lock(string owner, string name, int issueNumber, LockRe
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="lockReason">The reason for locking the issue</param>
-        public IObservable<Unit> Lock(long repositoryId, int issueNumber, LockReason? lockReason = null)
+        public IObservable<Unit> Lock(long repositoryId, long issueNumber, LockReason? lockReason = null)
         {
             return _client.Lock(repositoryId, issueNumber, lockReason).ToObservable();
         }
@@ -53,7 +53,7 @@ public IObservable<Unit> Lock(long repositoryId, int issueNumber, LockReason? lo
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Unit> Unlock(string owner, string name, int issueNumber)
+        public IObservable<Unit> Unlock(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -67,7 +67,7 @@ public IObservable<Unit> Unlock(string owner, string name, int issueNumber)
         /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        public IObservable<Unit> Unlock(long repositoryId, int issueNumber)
+        public IObservable<Unit> Unlock(long repositoryId, long issueNumber)
         {
             return _client.Unlock(repositoryId, issueNumber).ToObservable();
         }
diff --git a/Octokit.Tests.Integration/Clients/IssueCommentsClientTests.cs b/Octokit.Tests.Integration/Clients/IssueCommentsClientTests.cs
index 287aed6ebd..e3a940ad15 100644
--- a/Octokit.Tests.Integration/Clients/IssueCommentsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssueCommentsClientTests.cs
@@ -260,7 +260,7 @@ public class TheGetAllForIssueMethod
 
         const string owner = "octokit";
         const string name = "octokit.net";
-        const int issueNumber = 1115;
+        const long issueNumber = 1115;
         const long repositoryId = 7528679;
 
         public TheGetAllForIssueMethod()
@@ -594,7 +594,7 @@ async static Task<int> HelperCreateIssue(string owner, string repo)
         return issue.Number;
     }
 
-    async static Task<long> HelperCreateIssueCommentWithReactions(string owner, string repo, int issueNumber)
+    async static Task<long> HelperCreateIssueCommentWithReactions(string owner, string repo, long issueNumber)
     {
         var github = Helper.GetAuthenticatedClient();
 
diff --git a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
index 6245620aab..d269c47797 100644
--- a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
@@ -722,7 +722,7 @@ public void EnsuresNonNullArguments()
         }
     }
 
-    static Issue CreateIssue(int issueNumber)
+    static Issue CreateIssue(long issueNumber)
     {
         var serializer = new SimpleJsonSerializer();
         return serializer.Deserialize<Issue>(@"{""number"": """ + issueNumber + @"""}");
diff --git a/Octokit/Clients/AssigneesClient.cs b/Octokit/Clients/AssigneesClient.cs
index 1c0677c65d..c686f97c2e 100644
--- a/Octokit/Clients/AssigneesClient.cs
+++ b/Octokit/Clients/AssigneesClient.cs
@@ -109,7 +109,7 @@ public async Task<bool> CheckAssignee(string owner, string name, string assignee
         /// <param name="assignees">List of names of assignees to add</param>
         /// <returns></returns>
         [ManualRoute("POST", "/repos/{owner}/{repo}/issues/{issue_number}/assignees")]
-        public Task<Issue> AddAssignees(string owner, string name, int issueNumber, AssigneesUpdate assignees)
+        public Task<Issue> AddAssignees(string owner, string name, long issueNumber, AssigneesUpdate assignees)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -127,7 +127,7 @@ public Task<Issue> AddAssignees(string owner, string name, int issueNumber, Assi
         /// <param name="assignees">List of assignees to remove</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/{issue_number}/assignees")]
-        public Task<Issue> RemoveAssignees(string owner, string name, int issueNumber, AssigneesUpdate assignees)
+        public Task<Issue> RemoveAssignees(string owner, string name, long issueNumber, AssigneesUpdate assignees)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
diff --git a/Octokit/Clients/IAssigneesClient.cs b/Octokit/Clients/IAssigneesClient.cs
index 4bec13f39b..69557d63ae 100644
--- a/Octokit/Clients/IAssigneesClient.cs
+++ b/Octokit/Clients/IAssigneesClient.cs
@@ -55,7 +55,7 @@ public interface IAssigneesClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="assignees">List of names of assignees to add</param>
         /// <returns></returns>
-        Task<Issue> AddAssignees(string owner, string name, int issueNumber, AssigneesUpdate assignees);
+        Task<Issue> AddAssignees(string owner, string name, long issueNumber, AssigneesUpdate assignees);
 
         /// <summary>
         /// Remove assignees from a specified Issue.
@@ -65,7 +65,7 @@ public interface IAssigneesClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="assignees">List of assignees to remove</param>
         /// <returns></returns>
-        Task<Issue> RemoveAssignees(string owner, string name, int issueNumber, AssigneesUpdate assignees);
+        Task<Issue> RemoveAssignees(string owner, string name, long issueNumber, AssigneesUpdate assignees);
 
         /// <summary>
         /// Checks to see if a user is an assignee for a repository.
diff --git a/Octokit/Clients/IIssueCommentsClient.cs b/Octokit/Clients/IIssueCommentsClient.cs
index f14894e9d0..94be542f77 100644
--- a/Octokit/Clients/IIssueCommentsClient.cs
+++ b/Octokit/Clients/IIssueCommentsClient.cs
@@ -108,7 +108,7 @@ public interface IIssueCommentsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int issueNumber);
+        Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -116,7 +116,7 @@ public interface IIssueCommentsClient
         /// <remarks>http://developer.github.com/v3/issues/comments/#list-comments-on-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int issueNumber);
+        Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -126,7 +126,7 @@ public interface IIssueCommentsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -135,7 +135,7 @@ public interface IIssueCommentsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -145,7 +145,7 @@ public interface IIssueCommentsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
-        Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int issueNumber, IssueCommentRequest request);
+        Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, long issueNumber, IssueCommentRequest request);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -154,7 +154,7 @@ public interface IIssueCommentsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
-        Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int issueNumber, IssueCommentRequest request);
+        Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, long issueNumber, IssueCommentRequest request);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -165,7 +165,7 @@ public interface IIssueCommentsClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int issueNumber, IssueCommentRequest request, ApiOptions options);
+        Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, long issueNumber, IssueCommentRequest request, ApiOptions options);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -175,7 +175,7 @@ public interface IIssueCommentsClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int issueNumber, IssueCommentRequest request, ApiOptions options);
+        Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, long issueNumber, IssueCommentRequest request, ApiOptions options);
 
         /// <summary>
         /// Creates a new Issue Comment for a specified Issue.
@@ -185,7 +185,7 @@ public interface IIssueCommentsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="newComment">The new comment to add to the issue</param>
-        Task<IssueComment> Create(string owner, string name, int issueNumber, string newComment);
+        Task<IssueComment> Create(string owner, string name, long issueNumber, string newComment);
 
         /// <summary>
         /// Creates a new Issue Comment for a specified Issue.
@@ -194,7 +194,7 @@ public interface IIssueCommentsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="newComment">The new comment to add to the issue</param>
-        Task<IssueComment> Create(long repositoryId, int issueNumber, string newComment);
+        Task<IssueComment> Create(long repositoryId, long issueNumber, string newComment);
 
         /// <summary>
         /// Updates a specified Issue Comment.
diff --git a/Octokit/Clients/IIssueReactionsClient.cs b/Octokit/Clients/IIssueReactionsClient.cs
index d26f37bcb6..de22270215 100644
--- a/Octokit/Clients/IIssueReactionsClient.cs
+++ b/Octokit/Clients/IIssueReactionsClient.cs
@@ -18,7 +18,7 @@ public interface IIssueReactionsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int issueNumber);
+        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Get all reactions for a specified Issue
@@ -28,7 +28,7 @@ public interface IIssueReactionsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Get all reactions for a specified Issue
@@ -36,7 +36,7 @@ public interface IIssueReactionsClient
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int issueNumber);
+        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Get all reactions for a specified Issue
@@ -45,7 +45,7 @@ public interface IIssueReactionsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Creates a reaction for a specified Issue
@@ -55,7 +55,7 @@ public interface IIssueReactionsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reaction">The reaction to create</param>
-        Task<Reaction> Create(string owner, string name, int issueNumber, NewReaction reaction);
+        Task<Reaction> Create(string owner, string name, long issueNumber, NewReaction reaction);
 
         /// <summary>
         /// Creates a reaction for a specified Issue
@@ -64,7 +64,7 @@ public interface IIssueReactionsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reaction">The reaction to create</param>
-        Task<Reaction> Create(long repositoryId, int issueNumber, NewReaction reaction);
+        Task<Reaction> Create(long repositoryId, long issueNumber, NewReaction reaction);
 
         /// <summary>
         /// Deletes a reaction for a specified Issue
@@ -75,7 +75,7 @@ public interface IIssueReactionsClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(string owner, string name, int issueNumber, long reactionId);
+        Task Delete(string owner, string name, long issueNumber, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Issue
@@ -85,6 +85,6 @@ public interface IIssueReactionsClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(long repositoryId, int issueNumber, long reactionId);
+        Task Delete(long repositoryId, long issueNumber, long reactionId);
     }
 }
diff --git a/Octokit/Clients/IIssueTimelineClient.cs b/Octokit/Clients/IIssueTimelineClient.cs
index 15aad6e57c..7086732aec 100644
--- a/Octokit/Clients/IIssueTimelineClient.cs
+++ b/Octokit/Clients/IIssueTimelineClient.cs
@@ -20,7 +20,7 @@ public interface IIssueTimelineClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="repo">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, int issueNumber);
+        Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, long issueNumber);
 
         /// <summary>
         /// Gets all the various events that have occurred around an issue or pull request.
@@ -32,7 +32,7 @@ public interface IIssueTimelineClient
         /// <param name="repo">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API repsonse</param>
-        Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all the various events that have occurred around an issue or pull request.
@@ -42,7 +42,7 @@ public interface IIssueTimelineClient
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, int issueNumber);
+        Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets all the various events that have occurred around an issue or pull request.
@@ -53,6 +53,6 @@ public interface IIssueTimelineClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options);
     }
 }
diff --git a/Octokit/Clients/IIssuesClient.cs b/Octokit/Clients/IIssuesClient.cs
index 302ea670b2..5d1b955afe 100644
--- a/Octokit/Clients/IIssuesClient.cs
+++ b/Octokit/Clients/IIssuesClient.cs
@@ -54,7 +54,7 @@ public interface IIssuesClient
         /// <param name="issueNumber">The issue number</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        Task<Issue> Get(string owner, string name, int issueNumber);
+        Task<Issue> Get(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Gets a single Issue by number.
@@ -66,7 +66,7 @@ public interface IIssuesClient
         /// <param name="issueNumber">The issue number</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        Task<Issue> Get(long repositoryId, int issueNumber);
+        Task<Issue> Get(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets all open issues assigned to the authenticated user across all the authenticated user’s visible
@@ -303,7 +303,7 @@ public interface IIssuesClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
-        Task<Issue> Update(string owner, string name, int issueNumber, IssueUpdate issueUpdate);
+        Task<Issue> Update(string owner, string name, long issueNumber, IssueUpdate issueUpdate);
 
         /// <summary>
         /// Updates an issue for the specified repository. Any user with pull access to a repository can update an
@@ -314,7 +314,7 @@ public interface IIssuesClient
         /// <param name="issueNumber">The issue number</param>
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
-        Task<Issue> Update(long repositoryId, int issueNumber, IssueUpdate issueUpdate);
+        Task<Issue> Update(long repositoryId, long issueNumber, IssueUpdate issueUpdate);
 
     }
 }
diff --git a/Octokit/Clients/IIssuesEventsClient.cs b/Octokit/Clients/IIssuesEventsClient.cs
index 992de4cf0a..882c82655d 100644
--- a/Octokit/Clients/IIssuesEventsClient.cs
+++ b/Octokit/Clients/IIssuesEventsClient.cs
@@ -21,7 +21,7 @@ public interface IIssuesEventsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, int issueNumber);
+        Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Gets all events for the issue.
@@ -31,7 +31,7 @@ public interface IIssuesEventsClient
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int issueNumber);
+        Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets all events for the issue.
@@ -43,7 +43,7 @@ public interface IIssuesEventsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all events for the issue.
@@ -54,7 +54,7 @@ public interface IIssuesEventsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all events for the repository.
diff --git a/Octokit/Clients/IIssuesLabelsClient.cs b/Octokit/Clients/IIssuesLabelsClient.cs
index 453d597284..c2fcf0e777 100644
--- a/Octokit/Clients/IIssuesLabelsClient.cs
+++ b/Octokit/Clients/IIssuesLabelsClient.cs
@@ -21,7 +21,7 @@ public interface IIssuesLabelsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
-        Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int issueNumber);
+        Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Gets all  labels for the issue.
@@ -31,7 +31,7 @@ public interface IIssuesLabelsClient
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
-        Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, int issueNumber);
+        Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, long issueNumber);
 
         /// <summary>
         /// Gets all  labels for the issue.
@@ -43,7 +43,7 @@ public interface IIssuesLabelsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all  labels for the issue.
@@ -54,7 +54,7 @@ public interface IIssuesLabelsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options);
+        Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options);
 
         /// <summary>
         /// Gets all  labels for the repository.
@@ -240,7 +240,7 @@ public interface IIssuesLabelsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labels">The names of the labels to add</param>
-        Task<IReadOnlyList<Label>> AddToIssue(string owner, string name, int issueNumber, string[] labels);
+        Task<IReadOnlyList<Label>> AddToIssue(string owner, string name, long issueNumber, string[] labels);
 
         /// <summary>
         /// Adds a label to an issue
@@ -251,7 +251,7 @@ public interface IIssuesLabelsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labels">The names of the labels to add</param>
-        Task<IReadOnlyList<Label>> AddToIssue(long repositoryId, int issueNumber, string[] labels);
+        Task<IReadOnlyList<Label>> AddToIssue(long repositoryId, long issueNumber, string[] labels);
 
         /// <summary>
         /// Removes a label from an issue
@@ -263,7 +263,7 @@ public interface IIssuesLabelsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labelName">The name of the label to remove</param>
-        Task<IReadOnlyList<Label>> RemoveFromIssue(string owner, string name, int issueNumber, string labelName);
+        Task<IReadOnlyList<Label>> RemoveFromIssue(string owner, string name, long issueNumber, string labelName);
 
         /// <summary>
         /// Removes a label from an issue
@@ -274,7 +274,7 @@ public interface IIssuesLabelsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labelName">The name of the label to remove</param>
-        Task<IReadOnlyList<Label>> RemoveFromIssue(long repositoryId, int issueNumber, string labelName);
+        Task<IReadOnlyList<Label>> RemoveFromIssue(long repositoryId, long issueNumber, string labelName);
 
         /// <summary>
         /// Replaces all labels on the specified issues with the provided labels
@@ -286,7 +286,7 @@ public interface IIssuesLabelsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labels">The names of the labels to set</param>
-        Task<IReadOnlyList<Label>> ReplaceAllForIssue(string owner, string name, int issueNumber, string[] labels);
+        Task<IReadOnlyList<Label>> ReplaceAllForIssue(string owner, string name, long issueNumber, string[] labels);
 
         /// <summary>
         /// Replaces all labels on the specified issues with the provided labels
@@ -297,7 +297,7 @@ public interface IIssuesLabelsClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labels">The names of the labels to set</param>
-        Task<IReadOnlyList<Label>> ReplaceAllForIssue(long repositoryId, int issueNumber, string[] labels);
+        Task<IReadOnlyList<Label>> ReplaceAllForIssue(long repositoryId, long issueNumber, string[] labels);
 
         /// <summary>
         /// Removes all labels from an issue
@@ -308,7 +308,7 @@ public interface IIssuesLabelsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
-        Task RemoveAllFromIssue(string owner, string name, int issueNumber);
+        Task RemoveAllFromIssue(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Removes all labels from an issue
@@ -318,6 +318,6 @@ public interface IIssuesLabelsClient
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
-        Task RemoveAllFromIssue(long repositoryId, int issueNumber);
+        Task RemoveAllFromIssue(long repositoryId, long issueNumber);
     }
 }
diff --git a/Octokit/Clients/ILockUnlockClient.cs b/Octokit/Clients/ILockUnlockClient.cs
index 2833ddac69..625143c206 100644
--- a/Octokit/Clients/ILockUnlockClient.cs
+++ b/Octokit/Clients/ILockUnlockClient.cs
@@ -15,7 +15,7 @@ public interface ILockUnlockClient
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="lockReason">The reason for locking the issue</param>
-        Task Lock(string owner, string name, int issueNumber, LockReason? lockReason = null);
+        Task Lock(string owner, string name, long issueNumber, LockReason? lockReason = null);
 
         /// <summary>
         /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
@@ -24,7 +24,7 @@ public interface ILockUnlockClient
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <param name="lockReason">The reason for locking the issue</param>
-        Task Lock(long repositoryId, int issueNumber, LockReason? lockReason = null);
+        Task Lock(long repositoryId, long issueNumber, LockReason? lockReason = null);
 
         /// <summary>
         /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
@@ -33,7 +33,7 @@ public interface ILockUnlockClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task Unlock(string owner, string name, int issueNumber);
+        Task Unlock(string owner, string name, long issueNumber);
 
         /// <summary>
         /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
@@ -41,7 +41,7 @@ public interface ILockUnlockClient
         /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
-        Task Unlock(long repositoryId, int issueNumber);
+        Task Unlock(long repositoryId, long issueNumber);
 
     }
 }
diff --git a/Octokit/Clients/IssueCommentsClient.cs b/Octokit/Clients/IssueCommentsClient.cs
index 53e3cebb37..26b4ab5a6f 100644
--- a/Octokit/Clients/IssueCommentsClient.cs
+++ b/Octokit/Clients/IssueCommentsClient.cs
@@ -178,7 +178,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(long repositoryId,
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{number]/comments")]
-        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int issueNumber)
+        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -193,7 +193,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string nam
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/comments")]
-        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int issueNumber)
+        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, long issueNumber)
         {
             return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -207,7 +207,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int i
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{number]/comments")]
-        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -224,7 +224,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string nam
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/comments")]
-        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
@@ -240,7 +240,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int i
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{number]/comments")]
-        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int issueNumber, IssueCommentRequest request)
+        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, long issueNumber, IssueCommentRequest request)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -257,7 +257,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string nam
         /// <param name="issueNumber">The issue number</param>
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/comments")]
-        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int issueNumber, IssueCommentRequest request)
+        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, long issueNumber, IssueCommentRequest request)
         {
             Ensure.ArgumentNotNull(request, nameof(request));
 
@@ -274,7 +274,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int i
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{number]/comments")]
-        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int issueNumber, IssueCommentRequest request, ApiOptions options)
+        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, long issueNumber, IssueCommentRequest request, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -293,7 +293,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string nam
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/comments")]
-        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int issueNumber, IssueCommentRequest request, ApiOptions options)
+        public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, long issueNumber, IssueCommentRequest request, ApiOptions options)
         {
             Ensure.ArgumentNotNull(request, nameof(request));
             Ensure.ArgumentNotNull(options, nameof(options));
@@ -310,7 +310,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int i
         /// <param name="issueNumber">The issue number</param>
         /// <param name="newComment">The new comment to add to the issue</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/issues/{number]/comments")]
-        public Task<IssueComment> Create(string owner, string name, int issueNumber, string newComment)
+        public Task<IssueComment> Create(string owner, string name, long issueNumber, string newComment)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -327,7 +327,7 @@ public Task<IssueComment> Create(string owner, string name, int issueNumber, str
         /// <param name="issueNumber">The issue number</param>
         /// <param name="newComment">The new comment to add to the issue</param>
         [ManualRoute("POST", "/repositories/{id}/issues/{number}/comments")]
-        public Task<IssueComment> Create(long repositoryId, int issueNumber, string newComment)
+        public Task<IssueComment> Create(long repositoryId, long issueNumber, string newComment)
         {
             Ensure.ArgumentNotNull(newComment, nameof(newComment));
 
diff --git a/Octokit/Clients/IssueReactionsClient.cs b/Octokit/Clients/IssueReactionsClient.cs
index 072de77f92..9f9b6dcff3 100644
--- a/Octokit/Clients/IssueReactionsClient.cs
+++ b/Octokit/Clients/IssueReactionsClient.cs
@@ -24,7 +24,7 @@ public IssueReactionsClient(IApiConnection apiConnection)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int issueNumber)
+        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long issueNumber)
         {
             return GetAll(owner, name, issueNumber, ApiOptions.None);
         }
@@ -38,7 +38,7 @@ public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int issue
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -54,7 +54,7 @@ public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int issue
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int issueNumber)
+        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long issueNumber)
         {
             return GetAll(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -67,7 +67,7 @@ public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int issueNumber)
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
@@ -83,7 +83,7 @@ public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int issueNumber,
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reaction">The reaction to create</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/issues/{issue_number}/reactions")]
-        public Task<Reaction> Create(string owner, string name, int issueNumber, NewReaction reaction)
+        public Task<Reaction> Create(string owner, string name, long issueNumber, NewReaction reaction)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -100,7 +100,7 @@ public Task<Reaction> Create(string owner, string name, int issueNumber, NewReac
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reaction">The reaction to create</param>
         [ManualRoute("POST", "/repositories/{id}/issues/{number}/reactions")]
-        public Task<Reaction> Create(long repositoryId, int issueNumber, NewReaction reaction)
+        public Task<Reaction> Create(long repositoryId, long issueNumber, NewReaction reaction)
         {
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
@@ -117,7 +117,7 @@ public Task<Reaction> Create(long repositoryId, int issueNumber, NewReaction rea
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/{issue_number}/reactions/{reaction_id}")]
-        public Task Delete(string owner, string name, int issueNumber, long reactionId)
+        public Task Delete(string owner, string name, long issueNumber, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -134,7 +134,7 @@ public Task Delete(string owner, string name, int issueNumber, long reactionId)
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repositories/{id}/issues/{issue_number}/reactions/{reaction_id}")]
-        public Task Delete(long repositoryId, int issueNumber, long reactionId)
+        public Task Delete(long repositoryId, long issueNumber, long reactionId)
         {
             return ApiConnection.Delete(ApiUrls.IssueReaction(repositoryId, issueNumber, reactionId));
         }
diff --git a/Octokit/Clients/IssueTimelineClient.cs b/Octokit/Clients/IssueTimelineClient.cs
index d12b8e5bfb..da772768a2 100644
--- a/Octokit/Clients/IssueTimelineClient.cs
+++ b/Octokit/Clients/IssueTimelineClient.cs
@@ -25,7 +25,7 @@ public IssueTimelineClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="repo">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/timeline")]
-        public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, int issueNumber)
+        public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
@@ -44,7 +44,7 @@ public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, strin
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API repsonse</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/timeline")]
-        public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
@@ -62,7 +62,7 @@ public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, strin
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/timeline")]
-        public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, int issueNumber)
+        public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, long issueNumber)
         {
             return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -77,7 +77,7 @@ public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId,
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/timeline")]
-        public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
diff --git a/Octokit/Clients/IssuesClient.cs b/Octokit/Clients/IssuesClient.cs
index 837b392d48..298b48d3cf 100644
--- a/Octokit/Clients/IssuesClient.cs
+++ b/Octokit/Clients/IssuesClient.cs
@@ -73,7 +73,7 @@ public IssuesClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}")]
-        public Task<Issue> Get(string owner, string name, int issueNumber)
+        public Task<Issue> Get(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -90,7 +90,7 @@ public Task<Issue> Get(string owner, string name, int issueNumber)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}")]
-        public Task<Issue> Get(long repositoryId, int issueNumber)
+        public Task<Issue> Get(long repositoryId, long issueNumber)
         {
             return ApiConnection.Get<Issue>(ApiUrls.Issue(repositoryId, issueNumber), null);
         }
@@ -473,7 +473,7 @@ public Task<Issue> Create(long repositoryId, NewIssue newIssue)
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
         [ManualRoute("PATCH", "/repos/{owner}/{repo}/issues/{issue_number}")]
-        public Task<Issue> Update(string owner, string name, int issueNumber, IssueUpdate issueUpdate)
+        public Task<Issue> Update(string owner, string name, long issueNumber, IssueUpdate issueUpdate)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -492,7 +492,7 @@ public Task<Issue> Update(string owner, string name, int issueNumber, IssueUpdat
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
         [ManualRoute("PATCH", "/repositories/{id}/issues/{number}")]
-        public Task<Issue> Update(long repositoryId, int issueNumber, IssueUpdate issueUpdate)
+        public Task<Issue> Update(long repositoryId, long issueNumber, IssueUpdate issueUpdate)
         {
             Ensure.ArgumentNotNull(issueUpdate, nameof(issueUpdate));
 
diff --git a/Octokit/Clients/IssuesEventsClient.cs b/Octokit/Clients/IssuesEventsClient.cs
index 9d7f54d7dc..025113d6d1 100644
--- a/Octokit/Clients/IssuesEventsClient.cs
+++ b/Octokit/Clients/IssuesEventsClient.cs
@@ -25,7 +25,7 @@ public IssuesEventsClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/events")]
-        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, int issueNumber)
+        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -42,7 +42,7 @@ public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name,
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/events")]
-        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int issueNumber)
+        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, long issueNumber)
         {
             return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -58,7 +58,7 @@ public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int iss
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/events")]
-        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -77,7 +77,7 @@ public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name,
         /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/events")]
-        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
diff --git a/Octokit/Clients/IssuesLabelsClient.cs b/Octokit/Clients/IssuesLabelsClient.cs
index 84c67b5832..35a7034f41 100644
--- a/Octokit/Clients/IssuesLabelsClient.cs
+++ b/Octokit/Clients/IssuesLabelsClient.cs
@@ -26,7 +26,7 @@ public IssuesLabelsClient(IApiConnection apiConnection)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/labels")]
-        public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int issueNumber)
+        public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -43,7 +43,7 @@ public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/labels")]
-        public Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, int issueNumber)
+        public Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, long issueNumber)
         {
             return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
@@ -59,7 +59,7 @@ public Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, int issueNum
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/labels")]
-        public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -78,7 +78,7 @@ public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/labels")]
-        public Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
+        public Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, long issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
@@ -378,7 +378,7 @@ public Task<Label> Update(long repositoryId, string labelName, LabelUpdate label
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labels">The names of the labels to add</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/issues/{issue_number}/labels")]
-        public Task<IReadOnlyList<Label>> AddToIssue(string owner, string name, int issueNumber, string[] labels)
+        public Task<IReadOnlyList<Label>> AddToIssue(string owner, string name, long issueNumber, string[] labels)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -397,7 +397,7 @@ public Task<IReadOnlyList<Label>> AddToIssue(string owner, string name, int issu
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labels">The names of the labels to add</param>
         [ManualRoute("POST", "/repositories/{id}/issues/{number}/labels")]
-        public Task<IReadOnlyList<Label>> AddToIssue(long repositoryId, int issueNumber, string[] labels)
+        public Task<IReadOnlyList<Label>> AddToIssue(long repositoryId, long issueNumber, string[] labels)
         {
             Ensure.ArgumentNotNull(labels, nameof(labels));
 
@@ -415,7 +415,7 @@ public Task<IReadOnlyList<Label>> AddToIssue(long repositoryId, int issueNumber,
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labelName">The name of the label to remove</param>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/{issue_number}/labels")]
-        public Task<IReadOnlyList<Label>> RemoveFromIssue(string owner, string name, int issueNumber, string labelName)
+        public Task<IReadOnlyList<Label>> RemoveFromIssue(string owner, string name, long issueNumber, string labelName)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -434,7 +434,7 @@ public Task<IReadOnlyList<Label>> RemoveFromIssue(string owner, string name, int
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labelName">The name of the label to remove</param>
         [ManualRoute("DELETE", "/repositories/{id}/issues/{number}/labels")]
-        public Task<IReadOnlyList<Label>> RemoveFromIssue(long repositoryId, int issueNumber, string labelName)
+        public Task<IReadOnlyList<Label>> RemoveFromIssue(long repositoryId, long issueNumber, string labelName)
         {
             Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
@@ -452,7 +452,7 @@ public Task<IReadOnlyList<Label>> RemoveFromIssue(long repositoryId, int issueNu
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labels">The names of the labels to set</param>
         [ManualRoute("PUT", "/repos/{owner}/{repo}/issues/{issue_number}/labels")]
-        public Task<IReadOnlyList<Label>> ReplaceAllForIssue(string owner, string name, int issueNumber, string[] labels)
+        public Task<IReadOnlyList<Label>> ReplaceAllForIssue(string owner, string name, long issueNumber, string[] labels)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -471,7 +471,7 @@ public Task<IReadOnlyList<Label>> ReplaceAllForIssue(string owner, string name,
         /// <param name="issueNumber">The number of the issue</param>
         /// <param name="labels">The names of the labels to set</param>
         [ManualRoute("PUT", "/repositories/{id}/issues/{number}/labels")]
-        public Task<IReadOnlyList<Label>> ReplaceAllForIssue(long repositoryId, int issueNumber, string[] labels)
+        public Task<IReadOnlyList<Label>> ReplaceAllForIssue(long repositoryId, long issueNumber, string[] labels)
         {
             Ensure.ArgumentNotNull(labels, nameof(labels));
 
@@ -488,7 +488,7 @@ public Task<IReadOnlyList<Label>> ReplaceAllForIssue(long repositoryId, int issu
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/{issue_number}/labels")]
-        public Task RemoveAllFromIssue(string owner, string name, int issueNumber)
+        public Task RemoveAllFromIssue(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -505,7 +505,7 @@ public Task RemoveAllFromIssue(string owner, string name, int issueNumber)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The number of the issue</param>
         [ManualRoute("DELETE", "/repositories/{id}/issues/{number}/labels")]
-        public Task RemoveAllFromIssue(long repositoryId, int issueNumber)
+        public Task RemoveAllFromIssue(long repositoryId, long issueNumber)
         {
             return ApiConnection.Delete(ApiUrls.IssueLabels(repositoryId, issueNumber));
         }
diff --git a/Octokit/Clients/LockUnlockClient.cs b/Octokit/Clients/LockUnlockClient.cs
index 0ef75afebf..0167139c61 100644
--- a/Octokit/Clients/LockUnlockClient.cs
+++ b/Octokit/Clients/LockUnlockClient.cs
@@ -24,7 +24,7 @@ public LockUnlockClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="issueNumber">The issue number</param>
         /// <param name="lockReason">The reason for locking the issue</param>
         [ManualRoute("PUT", "/repos/{owner}/{repo}/issues/{issue_number}/lock")]
-        public Task Lock(string owner, string name, int issueNumber, LockReason? lockReason = null)
+        public Task Lock(string owner, string name, long issueNumber, LockReason? lockReason = null)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -40,7 +40,7 @@ public Task Lock(string owner, string name, int issueNumber, LockReason? lockRea
         /// <param name="issueNumber">The issue number</param>
         /// <param name="lockReason">The reason for locking the issue</param>
         [ManualRoute("PUT", "/repositories/{id}/issues/{number}/lock")]
-        public Task Lock(long repositoryId, int issueNumber, LockReason? lockReason = null)
+        public Task Lock(long repositoryId, long issueNumber, LockReason? lockReason = null)
         {
             return ApiConnection.Put<Issue>(ApiUrls.IssueLock(repositoryId, issueNumber), lockReason.HasValue ? new { LockReaons = lockReason } : new object());
         }
@@ -53,7 +53,7 @@ public Task Lock(long repositoryId, int issueNumber, LockReason? lockReason = nu
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/{issue_number}/lock")]
-        public Task Unlock(string owner, string name, int issueNumber)
+        public Task Unlock(string owner, string name, long issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -68,7 +68,7 @@ public Task Unlock(string owner, string name, int issueNumber)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         [ManualRoute("DELETE", "/repositories/{id}/issues/{number}/lock")]
-        public Task Unlock(long repositoryId, int issueNumber)
+        public Task Unlock(long repositoryId, long issueNumber)
         {
             return ApiConnection.Delete(ApiUrls.IssueLock(repositoryId, issueNumber));
         }
diff --git a/Octokit/Helpers/ApiUrls.cs b/Octokit/Helpers/ApiUrls.cs
index a7437f17bf..81ec9e4217 100644
--- a/Octokit/Helpers/ApiUrls.cs
+++ b/Octokit/Helpers/ApiUrls.cs
@@ -561,7 +561,7 @@ public static Uri Issues(string organization)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri Issue(string owner, string name, int issueNumber)
+        public static Uri Issue(string owner, string name, long issueNumber)
         {
             return "repos/{0}/{1}/issues/{2}".FormatUri(owner, name, issueNumber);
         }
@@ -573,7 +573,7 @@ public static Uri Issue(string owner, string name, int issueNumber)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssueLock(string owner, string name, int issueNumber)
+        public static Uri IssueLock(string owner, string name, long issueNumber)
         {
             return "repos/{0}/{1}/issues/{2}/lock".FormatUri(owner, name, issueNumber);
         }
@@ -585,7 +585,7 @@ public static Uri IssueLock(string owner, string name, int issueNumber)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssueReactions(string owner, string name, int issueNumber)
+        public static Uri IssueReactions(string owner, string name, long issueNumber)
         {
             return "repos/{0}/{1}/issues/{2}/reactions".FormatUri(owner, name, issueNumber);
         }
@@ -596,7 +596,7 @@ public static Uri IssueReactions(string owner, string name, int issueNumber)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssueReactions(long repositoryId, int issueNumber)
+        public static Uri IssueReactions(long repositoryId, long issueNumber)
         {
             return "repositories/{0}/issues/{1}/reactions".FormatUri(repositoryId, issueNumber);
         }
@@ -609,7 +609,7 @@ public static Uri IssueReactions(long repositoryId, int issueNumber)
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reactionid for the issue</param>
         /// <returns></returns>
-        public static Uri IssueReaction(string owner, string name, int issueNumber, long reactionId)
+        public static Uri IssueReaction(string owner, string name, long issueNumber, long reactionId)
         {
             return "repos/{0}/{1}/issues/{2}/reactions/{3}".FormatUri(owner, name, issueNumber, reactionId);
         }
@@ -621,7 +621,7 @@ public static Uri IssueReaction(string owner, string name, int issueNumber, long
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reactionid for the issue</param>
         /// <returns></returns>
-        public static Uri IssueReaction(long repositoryId, int issueNumber, long reactionId)
+        public static Uri IssueReaction(long repositoryId, long issueNumber, long reactionId)
         {
             return "repositories/{0}/issues/{1}/reactions/{2}".FormatUri(repositoryId, issueNumber, reactionId);
         }
@@ -633,7 +633,7 @@ public static Uri IssueReaction(long repositoryId, int issueNumber, long reactio
         /// <param name="repo">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssueTimeline(string owner, string repo, int issueNumber)
+        public static Uri IssueTimeline(string owner, string repo, long issueNumber)
         {
             return "repos/{0}/{1}/issues/{2}/timeline".FormatUri(owner, repo, issueNumber);
         }
@@ -644,7 +644,7 @@ public static Uri IssueTimeline(string owner, string repo, int issueNumber)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssueTimeline(long repositoryId, int issueNumber)
+        public static Uri IssueTimeline(long repositoryId, long issueNumber)
         {
             return "repositories/{0}/issues/{1}/timeline".FormatUri(repositoryId, issueNumber);
         }
@@ -667,7 +667,7 @@ public static Uri IssueComments(string owner, string name)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssueComments(string owner, string name, int issueNumber)
+        public static Uri IssueComments(string owner, string name, long issueNumber)
         {
             return "repos/{0}/{1}/issues/{2}/comments".FormatUri(owner, name, issueNumber);
         }
@@ -846,7 +846,7 @@ public static Uri CheckAssignee(string owner, string name, string login)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssueAssignees(string owner, string name, int issueNumber)
+        public static Uri IssueAssignees(string owner, string name, long issueNumber)
         {
             return "repos/{0}/{1}/issues/{2}/assignees".FormatUri(owner, name, issueNumber);
         }
@@ -1052,7 +1052,7 @@ public static Uri Events(string owner, string name)
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssuesEvents(string owner, string name, int issueNumber)
+        public static Uri IssuesEvents(string owner, string name, long issueNumber)
         {
             return "repos/{0}/{1}/issues/{2}/events".FormatUri(owner, name, issueNumber);
         }
@@ -1134,7 +1134,7 @@ public static Uri Labels(string owner, string name)
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labelName">The name of the label</param>
         /// <returns></returns>
-        public static Uri IssueLabel(string owner, string name, int issueNumber, string labelName)
+        public static Uri IssueLabel(string owner, string name, long issueNumber, string labelName)
         {
             return "repos/{0}/{1}/issues/{2}/labels/{3}".FormatUri(owner, name, issueNumber, labelName);
         }
@@ -1146,7 +1146,7 @@ public static Uri IssueLabel(string owner, string name, int issueNumber, string
         /// <param name="name">The name of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns></returns>
-        public static Uri IssueLabels(string owner, string name, int issueNumber)
+        public static Uri IssueLabels(string owner, string name, long issueNumber)
         {
             return "repos/{0}/{1}/issues/{2}/labels".FormatUri(owner, name, issueNumber);
         }
@@ -3402,7 +3402,7 @@ public static Uri GpgKeys(long gpgKeyId)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns>The <see cref="Uri"/> for the specified issue.</returns>
-        public static Uri Issue(long repositoryId, int issueNumber)
+        public static Uri Issue(long repositoryId, long issueNumber)
         {
             return "repositories/{0}/issues/{1}".FormatUri(repositoryId, issueNumber);
         }
@@ -3434,7 +3434,7 @@ public static Uri IssueComments(long repositoryId)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns>The <see cref="Uri"/> for the comments of a specified issue.</returns>
-        public static Uri IssueComments(long repositoryId, int issueNumber)
+        public static Uri IssueComments(long repositoryId, long issueNumber)
         {
             return "repositories/{0}/issues/{1}/comments".FormatUri(repositoryId, issueNumber);
         }
@@ -3446,7 +3446,7 @@ public static Uri IssueComments(long repositoryId, int issueNumber)
         /// <param name="issueNumber">The issue number</param>
         /// <param name="labelName">The name of the label</param>
         /// <returns>The <see cref="Uri"/> that returns the named label for the specified issue.</returns>
-        public static Uri IssueLabel(long repositoryId, int issueNumber, string labelName)
+        public static Uri IssueLabel(long repositoryId, long issueNumber, string labelName)
         {
             return "repositories/{0}/issues/{1}/labels/{2}".FormatUri(repositoryId, issueNumber, labelName);
         }
@@ -3457,7 +3457,7 @@ public static Uri IssueLabel(long repositoryId, int issueNumber, string labelNam
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns>The <see cref="Uri"/> that returns all of the labels for the specified issue.</returns>
-        public static Uri IssueLabels(long repositoryId, int issueNumber)
+        public static Uri IssueLabels(long repositoryId, long issueNumber)
         {
             return "repositories/{0}/issues/{1}/labels".FormatUri(repositoryId, issueNumber);
         }
@@ -3468,7 +3468,7 @@ public static Uri IssueLabels(long repositoryId, int issueNumber)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns>The <see cref="Uri"/> for the specified issue to be locked/unlocked.</returns>
-        public static Uri IssueLock(long repositoryId, int issueNumber)
+        public static Uri IssueLock(long repositoryId, long issueNumber)
         {
             return "repositories/{0}/issues/{1}/lock".FormatUri(repositoryId, issueNumber);
         }
@@ -3500,7 +3500,7 @@ public static Uri IssuesEvent(long repositoryId, long eventId)
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="issueNumber">The issue number</param>
         /// <returns>The <see cref="Uri"/> that returns the issue/pull request event info for the specified issue.</returns>
-        public static Uri IssuesEvents(long repositoryId, int issueNumber)
+        public static Uri IssuesEvents(long repositoryId, long issueNumber)
         {
             return "repositories/{0}/issues/{1}/events".FormatUri(repositoryId, issueNumber);
         }