diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index 90df6e1be..274e01f35 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -7,7 +7,7 @@ import traceback
 import click
 
 from typing import Optional  # noqa
-import typing
+import typing  # noqa
 
 from mitmproxy import contentviews
 from mitmproxy import controller
diff --git a/mitmproxy/flow/options.py b/mitmproxy/flow/options.py
index 4bafad0fb..eccba5b13 100644
--- a/mitmproxy/flow/options.py
+++ b/mitmproxy/flow/options.py
@@ -31,7 +31,7 @@ class Options(options.Options):
             stickyauth=None,  # type: Optional[str]
             stream_large_bodies=None,  # type: Optional[str]
             verbosity=1,  # type: int
-            outfile=None,  # type: Optional[str]
+            outfile=None,  # type: Tuple[str, str]
             replay_ignore_content=False,  # type: bool
             replay_ignore_params=(),  # type: Sequence[str]
             replay_ignore_payload_params=(),  # type: Sequence[str]
diff --git a/test/mitmproxy/builtins/test_stream.py b/test/mitmproxy/builtins/test_stream.py
index 54e4f7d92..edaa41d27 100644
--- a/test/mitmproxy/builtins/test_stream.py
+++ b/test/mitmproxy/builtins/test_stream.py
@@ -7,7 +7,7 @@ import os.path
 from mitmproxy.builtins import stream
 from mitmproxy.flow import master, FlowReader
 from mitmproxy.flow import state
-from mitmproxy import options
+from mitmproxy.flow import options
 
 
 class TestStream(mastertest.MasterTest):