diff --git a/can/__init__.py b/can/__init__.py
index 2c973c764..a63646741 100644
--- a/can/__init__.py
+++ b/can/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # coding: utf-8
 
 """
diff --git a/can/message.py b/can/message.py
index 673bc3ca2..97346b366 100644
--- a/can/message.py
+++ b/can/message.py
@@ -103,9 +103,6 @@ def __init__(self, timestamp=0.0, arbitration_id=0, is_extended_id=None,
         if is_extended_id is not None:
             self.is_extended_id = is_extended_id
         else:
-            if not extended_id:
-                # Passed extended_id=False (default argument is True) so we warn to update
-                warnings.warn("extended_id is a deprecated parameter, use is_extended_id", DeprecationWarning)
             self.is_extended_id = extended_id
 
         self.is_remote_frame = is_remote_frame
diff --git a/doc/scripts.rst b/doc/scripts.rst
index 2b2290ad1..a63f1b108 100644
--- a/doc/scripts.rst
+++ b/doc/scripts.rst
@@ -25,7 +25,7 @@ can.viewer
 
 A screenshot of the application can be seen below:
 
-.. image:: ../images/viewer.png
+.. image:: images/viewer.png
     :width: 100%
 
 The first column is the number of times a frame with the particular ID that has been received, next is the timestamp of the frame relative to the first received message. The third column is the time between the current frame relative to the previous one. Next is the length of the frame, the data and then the decoded data converted according to the ``-d`` argument. The top red row indicates an error frame.