diff --git a/docs/Roadmap.md b/docs/Roadmap.md
index 897736f..3657e87 100644
--- a/docs/Roadmap.md
+++ b/docs/Roadmap.md
@@ -46,7 +46,13 @@
 
 Estimated release: Q1 2019
 
-To be decided...
+### Iterate on r19 toolchain improvements
+
+r19 covers the bulk of the work, but there are still a handful of flags required
+for building Android that should be lifted into the Clang driver. See [Issue
+812] for more information.
+
+[Issue 812]: https://github.com/android-ndk/ndk/issues/812
 
 ### Bugs
 
@@ -56,11 +62,6 @@
 
 ## Future work
 
-### Better code-completion support
-
-NDK r17 added names for all function arguments, but tools such as vim
-and Visual Studio Code need a `compile_commands.json` file.
-
 ### Better documentation
 
 We should probably add basic doc comments to the bionic headers:
@@ -93,10 +94,10 @@
 
  * Test coverage support.
  * Add `gmock`.
- * Make the [GTest-as-JUnit] wrapper available to developers so developers can
-   integrate their C++ tests into Studio.
+ * Make [GTestJNI] available to developers via some some package manager so
+   developers can integrate their C++ tests into Studio.
 
-[GTest-as-JUnit]: https://android-review.googlesource.com/c/platform/cts/+/683355
+[GTestJNI]: https://github.com/danalbert/GTestJNI
 
 ### C++ Modules
 
@@ -196,6 +197,8 @@
 
 Removed GCC and gnustl/stlport. Added lld.
 
+Added `compile_commands.json` for better tooling support.
+
 ### NDK r17
 
 Defaulted to libc++.