diff --git a/lib/src/chunked_coding.dart b/lib/src/chunked_coding.dart
index 8d2326c..1135339 100644
--- a/lib/src/chunked_coding.dart
+++ b/lib/src/chunked_coding.dart
@@ -10,7 +10,7 @@
 export 'chunked_coding/encoder.dart' hide chunkedCodingEncoder;
 export 'chunked_coding/decoder.dart' hide chunkedCodingDecoder;
 
-/// The canonical instance of [ChunkedCodec].
+/// The canonical instance of [ChunkedCodingCodec].
 const chunkedCoding = const ChunkedCodingCodec._();
 
 /// A codec that encodes and decodes the [chunked transfer coding][].
@@ -18,10 +18,10 @@
 /// [chunked transfer coding]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1
 ///
 /// The [encoder] creates a *single* chunked message for each call to
-/// [ChunkedEncoder.convert] or [ChunkedEncoder.startChunkedConversion]. This
-/// means that it will always add an end-of-message footer once conversion has
-/// finished. It doesn't support generating chunk extensions or trailing
-/// headers.
+/// [ChunkedCodingEncoder.convert] or
+/// [ChunkedCodingEncoder.startChunkedConversion]. This means that it will
+/// always add an end-of-message footer once conversion has finished. It doesn't
+/// support generating chunk extensions or trailing headers.
 ///
 /// Similarly, the [decoder] decodes a *single* chunked message into a stream of
 /// byte arrays that must be concatenated to get the full list (like most Dart
diff --git a/lib/src/chunked_coding/decoder.dart b/lib/src/chunked_coding/decoder.dart
index 3ffa520..b20c2d3 100644
--- a/lib/src/chunked_coding/decoder.dart
+++ b/lib/src/chunked_coding/decoder.dart
@@ -139,7 +139,7 @@
   }
 
   /// Returns the hex digit (0 through 15) corresponding to the byte at index
-  /// [i] in [bytes].
+  /// [index] in [bytes].
   ///
   /// If the given byte isn't a hexadecimal ASCII character, throws a
   /// [FormatException].
diff --git a/lib/src/media_type.dart b/lib/src/media_type.dart
index 22283d6..7fb2930 100644
--- a/lib/src/media_type.dart
+++ b/lib/src/media_type.dart
@@ -60,7 +60,7 @@
         var attribute = scanner.lastMatch[0];
         scanner.expect('=');
 
-        var value;
+        String value;
         if (scanner.scan(token)) {
           value = scanner.lastMatch[0];
         } else {