diff --git a/CHANGELOG.md b/CHANGELOG.md
index 494d4bad..d93dd2a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,15 @@
-## 4.0.1
+## 4.0.2-wip
 
+* Internal optimization to client code.
+* Small fixes, such as ports in testing and enabling `timeline_test.dart`.
+* When the keep alive manager runs into a timeout, it will finish the transport instead of closing
+  the connection, as defined in the gRPC spec.
 * Update xhr transport to migrate off legacy JS/HTML apis.
 
+## 4.0.1
+
+* Fix header and trailing not completing if the call is terminated. Fixes [#727](https://github.com/grpc/grpc-dart/issues/727)
+
 ## 4.0.0
 
 * Set compressed flag correctly for grpc-encoding = identity. Fixes [#669](https://github.com/grpc/grpc-dart/issues/669) (https://github.com/grpc/grpc-dart/pull/693)
diff --git a/lib/src/client/transport/xhr_transport.dart b/lib/src/client/transport/xhr_transport.dart
index 1de0eb78..e41a7f39 100644
--- a/lib/src/client/transport/xhr_transport.dart
+++ b/lib/src/client/transport/xhr_transport.dart
@@ -59,12 +59,14 @@ class XhrTransportStream implements GrpcTransportStream {
       if (_incomingProcessor.isClosed) {
         return;
       }
-      // TODO: dart-lang/web#285 use 'if' for now
-      if (_request.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
-        _onHeadersReceived();
-      } else if (_request.readyState == XMLHttpRequest.DONE) {
-        _onRequestDone();
-        _close();
+      switch (_request.readyState) {
+        case XMLHttpRequest.HEADERS_RECEIVED:
+          _onHeadersReceived();
+          break;
+        case XMLHttpRequest.DONE:
+          _onRequestDone();
+          _close();
+          break;
       }
     });
 
@@ -99,7 +101,7 @@ class XhrTransportStream implements GrpcTransportStream {
   bool _validateResponseState() {
     try {
       validateHttpStatusAndContentType(
-          _request.status, _parseHeaders(_request.getAllResponseHeaders()),
+          _request.status, _request.responseHeaders,
           rawResponse: _request.responseText);
       return true;
     } catch (e, st) {
@@ -113,8 +115,7 @@ class XhrTransportStream implements GrpcTransportStream {
     if (!_validateResponseState()) {
       return;
     }
-    _incomingMessages
-        .add(GrpcMetadata(_parseHeaders(_request.getAllResponseHeaders())));
+    _incomingMessages.add(GrpcMetadata(_request.responseHeaders));
   }
 
   void _onRequestDone() {
@@ -138,20 +139,6 @@ class XhrTransportStream implements GrpcTransportStream {
     _onDone(this);
   }
 
-  Map<String, String> _parseHeaders(String rawHeaders) {
-    final headers = <String, String>{};
-    final lines = rawHeaders.split('\r\n');
-    for (var line in lines) {
-      final index = line.indexOf(': ');
-      if (index != -1) {
-        final key = line.substring(0, index);
-        final value = line.substring(index + 2);
-        headers[key] = value;
-      }
-    }
-    return headers;
-  }
-
   @override
   Future<void> terminate() async {
     _close();
diff --git a/pubspec.yaml b/pubspec.yaml
index 7dcca90b..c7183bef 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   http2: ^2.2.0
   protobuf: '>=2.0.0 <4.0.0'
   clock: ^1.1.1
-  web: ^1.0.0
+  web: ^1.1.0
 
 dev_dependencies:
   build_runner: ^2.0.0