diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 046799d48cce71fcf2b59c836210111f9d75a917..bda05fab915ed684fc011f5748b039bfc278a3c3 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6015,11 +6015,11 @@ class LUSetInstanceParams(LogicalUnit):
     """Return the new params dict for the given params.
 
     @type old_params: dict
-    @type old_params: old parameters
+    @param old_params: old parameters
     @type update_dict: dict
-    @type update_dict: dict containing new parameter values,
-                       or constants.VALUE_DEFAULT to reset the
-                       parameter to its default value
+    @param update_dict: dict containing new parameter values,
+                        or constants.VALUE_DEFAULT to reset the
+                        parameter to its default value
     @type default_values: dict
     @param default_values: default values for the filled parameters
     @type parameter_types: dict
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 3ac16d7b16611ce50c538f5b3ba95ee9e1af1847..12152e85fb5f39db963c4aa76de994a06d68da08 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -160,7 +160,7 @@ def _EnsureInstancesExist(client, names):
   This function will raise an OpPrereqError in case they don't
   exist. Otherwise it will exit cleanly.
 
-  @type client: L{luxi.Client}
+  @type client: L{ganeti.luxi.Client}
   @param client: the client to use for the query
   @type names: list
   @param names: the list of instance names to query