Octokit upgrade and minor fixes