diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 21df7fc789b9776d06a23937db2693fae574566c..8d9931cd8a7300cbd262db937e0a72e48e4a0da9 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4530,7 +4530,7 @@ def _BlockdevFind(lu, node, dev, instance):
 
 
 def _CheckDiskConsistency(lu, instance, dev, node, on_primary, ldisk=False):
-  """Wrapper around L{_CheckDiskConistencyInner}.
+  """Wrapper around L{_CheckDiskConsistencyInner}.
 
   """
   (disk,) = _AnnotateDiskParams(instance, [dev], lu.cfg)
diff --git a/lib/config.py b/lib/config.py
index 290b43e19960c152f050ace8c2c7affa3c28012c..33d1b1e7f4a95e22f6363619f9b79987abaa5ce6 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -248,7 +248,7 @@ class ConfigWriter:
   def GetGroupDiskParams(self, group):
     """Get the disk params populated with inherit chain.
 
-    @type group: L{objects.Group}
+    @type group: L{objects.NodeGroup}
     @param group: The group we want to know the params for
     @return: A dict with the filled in disk params
 
@@ -258,7 +258,7 @@ class ConfigWriter:
   def _UnlockedGetGroupDiskParams(self, group):
     """Get the disk params populated with inherit chain down to node-group.
 
-    @type group: L{objects.Group}
+    @type group: L{objects.NodeGroup}
     @param group: The group we want to know the params for
     @return: A dict with the filled in disk params
 
diff --git a/lib/objects.py b/lib/objects.py
index f67823a565d14213266a0a44e5ea849f32118740..8cc31e79424205404df91dc20d9d6d12c9e69122 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -115,7 +115,7 @@ def FillIPolicy(default_ipolicy, custom_ipolicy, skip_keys=None):
 def FillDiskParams(default_dparams, custom_dparams, skip_keys=None):
   """Fills the disk parameter defaults.
 
-  @see FillDict: For parameters and return value
+  @see: L{FillDict} for parameters and return value
 
   """
   assert frozenset(default_dparams.keys()) == constants.DISK_TEMPLATES