diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 77c36ce43547f..a2dd3ec080883 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,6 @@
-clang/ @erichkeane, @Fznamznon
+* @bader
 
-clang/**/Driver @mdtoguchi @AGindinson
+clang/ @erichkeane, @Fznamznon
 
 llvm-spirv/ @AlexeySotkin, @AlexeySachkov
 
@@ -8,12 +8,10 @@ opencl-aot/ @dm-vodopyanov, @AlexeySachkov, @romanovvlad
 
 libdevice/ @asavonic, @vzakhari
 
-sycl/doc/extensions/ @mkinsner, @jbrodman
+sycl/ @romanovvlad, @bader
 
 sycl/doc/ @pvchupin, @kbobrovs
 
-sycl/ @romanovvlad, @bader
+sycl/doc/extensions/ @mkinsner, @jbrodman
 
 xpti/ @tovinkere, @andykaylor
-
-* @bader
diff --git a/sycl/doc/UsersManual.md b/sycl/doc/UsersManual.md
index ec761ffaf793a..da811c6f65a0f 100644
--- a/sycl/doc/UsersManual.md
+++ b/sycl/doc/UsersManual.md
@@ -1,7 +1,7 @@
 # Users Manual
 
 The DPC++ Compiler contains many options to generate the desired binaries for
-your application.
+your application. 
 
 ## SYCL specific command line options