diff --git a/misc/docs/source/tutorial/advanced_exercise/advanced_exercise_solution_1.py b/misc/docs/source/tutorial/advanced_exercise/advanced_exercise_solution_1.py
index 491a22f65dd..1553543506b 100644
--- a/misc/docs/source/tutorial/advanced_exercise/advanced_exercise_solution_1.py
+++ b/misc/docs/source/tutorial/advanced_exercise/advanced_exercise_solution_1.py
@@ -4,7 +4,7 @@
 import obspy.clients.fdsn
 
 
-client = obspy.clients.fdsn.Client("neries")
+client = obspy.clients.fdsn.Client("EMSC")
 
 events = client.get_events(minlatitude=46.1, maxlatitude=46.3,
                            minlongitude=7.6, maxlongitude=7.8,
diff --git a/misc/docs/source/tutorial/index.rst b/misc/docs/source/tutorial/index.rst
index cf9e2860fbf..6158035f6b2 100644
--- a/misc/docs/source/tutorial/index.rst
+++ b/misc/docs/source/tutorial/index.rst
@@ -14,8 +14,8 @@ will give you a good idea of the library’s flavor and style.
 A pdf version of the Tutorial is available :download:`here <ObsPyTutorial.pdf>`.
 
 There are also IPython notebooks available online with an
-`introduction to Python <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python Introduction/Python_Crash_Course.ipynb>`__
-(`with solutions/output <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python Introduction/Python_Crash_Course-with_solutions.ipynb>`__),
+`introduction to Python <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python%20Introduction/Python_Crash_Course.ipynb>`__
+(`with solutions/output <https://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/Python%20Introduction/Python_Crash_Course-with_solutions.ipynb>`__),
 an
 `introduction to ObsPy split up in multiple chapters <http://nbviewer.jupyter.org/github/obspy/docs/blob/master/workshops/2017-10-25_iris_stcu/ObsPy%20Tutorial/00_Introduction.ipynb>`__ (again, versions with/without solutions available)
 and a