diff --git a/boards/beagleplay/demos-and-tutorials/connect-wifi.rst b/boards/beagleplay/demos-and-tutorials/connect-wifi.rst
index 4de8dea3939c326fce4ca992d331d900e092bae5..e1a675b4a4e4d3f9d36b416c86ff461719cbe626 100644
--- a/boards/beagleplay/demos-and-tutorials/connect-wifi.rst
+++ b/boards/beagleplay/demos-and-tutorials/connect-wifi.rst
@@ -4,8 +4,12 @@ Connect WiFi
 #############
 
 .. note::
-    A common issue experienced by users when connecting to Wireless networks are network names that include special characters such as spaces, apostrophes etc, this may make connecting to your network more difficult. It is thus recommended to rename your Wireless AP to something simpler. For Example - renaming "Boris's Wireless Network" to "BorisNet". This avoids having to add special "escape" characters in the name. This shows up especially if you try connecting to iPhone/iOS HotSpots, where the network name is the device name, which by default is something like "Dan's iPhone". Also see `this potential solution. 
-<https://unix.stackexchange.com/questions/679862/wpa-supplicant-conf-escaping-characters/>`_.
+    A common issue experienced by users when connecting to Wireless networks are network names that include special characters 
+    such as spaces, apostrophes etc, this may make connecting to your network more difficult. It is thus recommended to 
+    rename your Wireless AP to something simpler. For Example - renaming "Boris's Wireless Network" to "BorisNet". 
+    This avoids having to add special "escape" characters in the name. This shows up especially if you try connecting to 
+    iPhone/iOS HotSpots, where the network name is the device name, which by default is something like "Dan's iPhone". 
+    Also see `this potential solution. <https://unix.stackexchange.com/questions/679862/wpa-supplicant-conf-escaping-characters/>`_.
 
 
 If you have a monitor and keyboard/mouse combo connected, the easiest way is to use the :ref:`beagleplay-wifi-wpa-gui`.
diff --git a/boards/beagleplay/demos-and-tutorials/using-mikrobus.rst b/boards/beagleplay/demos-and-tutorials/using-mikrobus.rst
index 3f6be8ebb0434f6fc014d146e3c9839633e872be..59b4430354bde19d90625b23155ab6564c406569 100644
--- a/boards/beagleplay/demos-and-tutorials/using-mikrobus.rst
+++ b/boards/beagleplay/demos-and-tutorials/using-mikrobus.rst
@@ -64,7 +64,7 @@ To use the add-on, see :ref:`beagleplay-mikrobus-using`.
 
    Not all Click boards with ClickID have valid ``manifest`` entries.
 
-.. _beagleplay-mikrobus-clickid:
+.. _beagleplay-mikrobus-without-clickid:
 
 What if my add-on doesn't have ClickID?
 ***************************************
diff --git a/boards/beaglev/ahead/demos-and-tutorials/using-csi.rst b/boards/beaglev/ahead/demos-and-tutorials/using-csi.rst
index 1f2a68bac71a607d3326c0c0fc9bfbd82508f363..c3f164d4e028c7d8c2ec2d8a3a6eaeb96ee23085 100644
--- a/boards/beaglev/ahead/demos-and-tutorials/using-csi.rst
+++ b/boards/beaglev/ahead/demos-and-tutorials/using-csi.rst
@@ -1,8 +1,8 @@
-.. _beaglev-ahead-csi:
-
 .. important:: 
     This document is a work on progress.
 
+.. _beaglev-ahead-csi:
+
 Using CSI Cameras
 #################