diff --git a/types/nodegit/blame-hunk.d.ts b/types/nodegit/blame-hunk.d.ts
index 601a7dbdfd..58ab8e7191 100644
--- a/types/nodegit/blame-hunk.d.ts
+++ b/types/nodegit/blame-hunk.d.ts
@@ -1,5 +1,5 @@
 import { Oid } from './oid';
-import { Signature } from './Signature';
+import { Signature } from './signature';
 
 export class BlameHunk {
     linesInHunk: number;
diff --git a/types/nodegit/cherry-pick.d.ts b/types/nodegit/cherry-pick.d.ts
index 333831a29b..291c5e0223 100644
--- a/types/nodegit/cherry-pick.d.ts
+++ b/types/nodegit/cherry-pick.d.ts
@@ -1,6 +1,7 @@
 import { Repository } from './repository';
 import { Commit } from './commit';
 import { MergeOptions } from './merge-options';
+import { CherrypickOptions } from './cherry-pick-options';
 
 export class Cherrypick {
     static cherrypick(repo: Repository, commit: Commit, options?: CherrypickOptions): Promise<number>;
diff --git a/types/nodegit/diff.d.ts b/types/nodegit/diff.d.ts
index 3612e402a4..d675b36acf 100644
--- a/types/nodegit/diff.d.ts
+++ b/types/nodegit/diff.d.ts
@@ -126,7 +126,7 @@ export namespace Diff {
 
 export class Diff {
     static blobToBuffer(old_blob: Blob, oldAsPath: string,
-        buffer: string, bufferAsPath: string, opts: DiffOptions, fileCb: Function, binaryCb: Function, hunkCb: Function, lineCb: Function): Promise<any>;
+                        buffer: string, bufferAsPath: string, opts: DiffOptions, fileCb: Function, binaryCb: Function, hunkCb: Function, lineCb: Function): Promise<any>;
     static indexToWorkdir(repo: Repository, index: Index, opts: DiffOptions): Promise<Diff>;
     static treeToIndex(repo: Repository, old_tree: Tree, index: Index, opts: DiffOptions): Promise<Diff>;
     static treeToTree(repo: Repository, old_tree: Tree, new_tree: Tree, opts: DiffOptions): Promise<Diff>;
diff --git a/types/nodegit/filter.d.ts b/types/nodegit/filter.d.ts
index aedc0dbd6f..da1f71c2b9 100644
--- a/types/nodegit/filter.d.ts
+++ b/types/nodegit/filter.d.ts
@@ -1,3 +1,5 @@
+import { WriteStream } from 'fs';
+
 import { Repository } from './repository';
 import { Blob } from './blob';
 import { Buf } from './buf';
@@ -20,9 +22,9 @@ export class Filter {
     static listContains(filters: any, name: string): number;
     static listLength(fl: any): number;
     static listNew(repo: Repository, mode: number, options: number): Promise<any>;
-    static listStreamBlob(filters: any, blob: Blob, target: Writestream): number;
-    static listStreamData(filters: any, data: Buf, target: Writestream): number;
-    static listStreamFile(filters: any, repo: Repository, path: string, target: Writestream): number;
+    static listStreamBlob(filters: any, blob: Blob, target: WriteStream): number;
+    static listStreamData(filters: any, data: Buf, target: WriteStream): number;
+    static listStreamFile(filters: any, repo: Repository, path: string, target: WriteStream): number;
     static unregister(name: string): number;
 
     lookup(name: string): Filter;