diff --git a/docs/clients/upnp.rst b/docs/clients/upnp.rst
index d0683df8..b5b18268 100644
--- a/docs/clients/upnp.rst
+++ b/docs/clients/upnp.rst
@@ -37,8 +37,6 @@ There are two ways Mopidy can be made available as an UPnP MediaRenderer:
 Using Mopidy-MPRIS and Rygel, or using Mopidy-MPD and upmpdcli.
 
 
-.. _upmpdcli:
-
 upmpdcli
 --------
 
@@ -68,8 +66,6 @@ MediaRenderer to the network, while using the MPD protocol to control Mopidy.
 4. A UPnP renderer should be available now.
 
 
-.. _rygel:
-
 Rygel
 -----
 
diff --git a/mopidy/core/library.py b/mopidy/core/library.py
index 5937b2c0..49a4a796 100644
--- a/mopidy/core/library.py
+++ b/mopidy/core/library.py
@@ -83,7 +83,7 @@ class LibraryController(object):
         :param string field: One of ``artist``, ``albumartist``, ``album``,
             ``composer``, ``performer``, ``date``or ``genre``.
         :param dict query: Query to use for limiting results, see
-            :method:`search` for details about the query format.
+            :meth:`search` for details about the query format.
         :rtype: set of values corresponding to the requested field type.
         """
         futures = [b.library.get_distinct(field, query)
diff --git a/mopidy/local/__init__.py b/mopidy/local/__init__.py
index 1587b63a..97ed4a09 100644
--- a/mopidy/local/__init__.py
+++ b/mopidy/local/__init__.py
@@ -96,7 +96,7 @@ class Library(object):
         :param string field: One of ``artist``, ``albumartist``, ``album``,
             ``composer``, ``performer``, ``date``or ``genre``.
         :param dict query: Query to use for limiting results, see
-            :method:`search` for details about the query format.
+            :meth:`search` for details about the query format.
         :rtype: set of values corresponding to the requested field type.
         """
         return set()
@@ -159,7 +159,7 @@ class Library(object):
         :param track: Track to add to the library
         :type track: :class:`~mopidy.models.Track`
         :param tags: All the tags the scanner found for the media. See
-            :module:`mopidy.audio.utils` for details about the tags.
+            :mod:`mopidy.audio.utils` for details about the tags.
         :type tags: dictionary of tag keys with a list of values.
         :param duration: Duration of media in milliseconds or :class:`None` if
             unknown