diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 623e0c996..2d6308698 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Issue or enhancement in wgpu-core
-    url: https://github.com/gfx-rs/wgpu/issues/new/choose
-    about: Issues with or enhancements for the core logic, validation, or the backends should go here.
+  - name: Issues with shaders
+    url: https://github.com/gfx-rs/naga/issues/new/choose
+    about: Issues with or enhancements for the shader translation.
   - name: Question about wgpu
     url: https://github.com/gfx-rs/wgpu-rs/discussions/new
     about: Any questions about how to use wgpu should go here.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 55be6c377..1fd37e134 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -6,12 +6,3 @@ _Describe what problem this is solving, and how it's solved._
 
 **Testing**
 _Explain how this change is tested._
-<!--
-Non-trivial functional changes would need to be tested through:
-  - [wgpu-rs](https://github.com/gfx-rs/wgpu-rs) - test the examples.
-  - [wgpu-native](https://github.com/gfx-rs/wgpu-native/) - check the generated C header for sanity.
-
-Ideally, a PR needs to link to the draft PRs in these projects with relevant modifications.
-See https://github.com/gfx-rs/wgpu/pull/666 for an example.
-If you can add a unit/integration test here in `wgpu`, that would be best.
--->
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d990ae85..60647d52a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-TBD
+TBD:
   - Merged wgpu-rs and wgpu back into a single repository
 
 ## v0.8 (2021-04-29)
diff --git a/bors.toml b/bors.toml
index 2cbeb4c7a..729709bdf 100644
--- a/bors.toml
+++ b/bors.toml
@@ -7,4 +7,6 @@ status = [
   "Ubuntu Nightly",
   "Windows Stable",
   "Windows Nightly",
+  "Web Assembly",
+  #"Clippy",
 ]
diff --git a/wgpu/examples/bunnymark/main.rs b/wgpu/examples/bunnymark/main.rs
index acb591f6d..e89a17bbd 100644
--- a/wgpu/examples/bunnymark/main.rs
+++ b/wgpu/examples/bunnymark/main.rs
@@ -131,7 +131,7 @@ impl framework::Example for Example {
         });
 
         let texture = {
-            let img_data = include_bytes!("../../logo.png");
+            let img_data = include_bytes!("../../../logo.png");
             let decoder = png::Decoder::new(std::io::Cursor::new(img_data));
             let (info, mut reader) = decoder.read_info().unwrap();
             let mut buf = vec![0; info.buffer_size()];
diff --git a/wgpu/logo.png b/wgpu/logo.png
deleted file mode 100644
index 17f35634d..000000000
Binary files a/wgpu/logo.png and /dev/null differ
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 328162b08..fa4bb4751 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! To start using the API, create an [`Instance`].
 
-#![doc(html_logo_url = "https://raw.githubusercontent.com/gfx-rs/wgpu-rs/master/logo.png")]
+#![doc(html_logo_url = "https://raw.githubusercontent.com/gfx-rs/wgpu/master/logo.png")]
 #![warn(missing_docs)]
 
 mod backend;