diff --git a/lib/rapi/baserlib.py b/lib/rapi/baserlib.py
index 3e467394f0c45e727a541a55c8884af62d754a35..5710000c604975dbe9f3314d6abd2e6b86f49a63 100644
--- a/lib/rapi/baserlib.py
+++ b/lib/rapi/baserlib.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2006, 2007, 2008 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -469,33 +469,33 @@ class OpcodeResource(ResourceBase):
   is defined at class level. Subclasses can define a C{Get$Method$OpInput}
   method to do their own opcode input processing (e.g. for static values). The
   C{$METHOD$_RENAME} variable defines which values are renamed (see
-  L{FillOpcode}).
+  L{baserlib.FillOpcode}).
 
   @cvar GET_OPCODE: Set this to a class derived from L{opcodes.OpCode} to
     automatically generate a GET handler submitting the opcode
   @cvar GET_RENAME: Set this to rename parameters in the GET handler (see
-    L{FillOpcode})
+    L{baserlib.FillOpcode})
   @ivar GetGetOpInput: Define this to override the default method for
     getting opcode parameters (see L{baserlib.OpcodeResource._GetDefaultData})
 
   @cvar PUT_OPCODE: Set this to a class derived from L{opcodes.OpCode} to
     automatically generate a PUT handler submitting the opcode
   @cvar PUT_RENAME: Set this to rename parameters in the PUT handler (see
-    L{FillOpcode})
+    L{baserlib.FillOpcode})
   @ivar GetPutOpInput: Define this to override the default method for
     getting opcode parameters (see L{baserlib.OpcodeResource._GetDefaultData})
 
   @cvar POST_OPCODE: Set this to a class derived from L{opcodes.OpCode} to
     automatically generate a POST handler submitting the opcode
   @cvar POST_RENAME: Set this to rename parameters in the DELETE handler (see
-    L{FillOpcode})
+    L{baserlib.FillOpcode})
   @ivar GetPostOpInput: Define this to override the default method for
     getting opcode parameters (see L{baserlib.OpcodeResource._GetDefaultData})
 
   @cvar DELETE_OPCODE: Set this to a class derived from L{opcodes.OpCode} to
     automatically generate a GET handler submitting the opcode
   @cvar DELETE_RENAME: Set this to rename parameters in the DELETE handler (see
-    L{FillOpcode})
+    L{baserlib.FillOpcode})
   @ivar GetDeleteOpInput: Define this to override the default method for
     getting opcode parameters (see L{baserlib.OpcodeResource._GetDefaultData})
 
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index e31d7e1e9db20609c2c6f2f2826c3235af5d1881..093e6d221886bea82eca0494a86469b64c752ff0 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1281,7 +1281,7 @@ class R_2_query_fields(baserlib.ResourceBase):
 
 
 class _R_Tags(baserlib.OpcodeResource):
-  """ Quasiclass for tagging resources
+  """Quasiclass for tagging resources.
 
   Manages tags. When inheriting this class you must define the
   TAG_LEVEL for it.