diff --git a/mwclient/client.py b/mwclient/client.py
index 7f7cf3b93aab6bba049d95402c4b3cc65c63cb6b..54677c90d658813acaadc70c61376093d6e27f9e 100644
--- a/mwclient/client.py
+++ b/mwclient/client.py
@@ -64,9 +64,14 @@ class Site(object):
 			
 		self.version = None
 			
-		self.Pages = listing.PageList(self)
-		self.Categories = listing.PageList(self, namespace = 14)
-		self.Images = listing.PageList(self, namespace = 6)
+		self.pages = listing.PageList(self)
+		self.categories = listing.PageList(self, namespace = 14)
+		self.images = listing.PageList(self, namespace = 6)
+		
+		# Compat
+		self.Pages = self.pages
+		self.Categories = self.categories
+		self.Images = self.images
 		
 		self.namespaces = self.default_namespaces
 		self.writeapi = False
@@ -147,6 +152,9 @@ class Site(object):
 				if info['error']['code'] in (u'internal_api_error_DBConnectionError', ):
 					self.wait(token)
 					continue
+				if '*' in info['error']:
+					raise errors.APIError(info['error']['code'],
+						info['error']['info'], info['error']['*'])
 				raise errors.APIError(info['error']['code'],
 					info['error']['info'], kwargs)
 			return info
diff --git a/mwclient/page.py b/mwclient/page.py
index 7e8381bd430e3b29126f81283841b5a51721bcd4..3ea5a6d5acbbbf6f65c2ed8d91f516a332841d25 100644
--- a/mwclient/page.py
+++ b/mwclient/page.py
@@ -139,6 +139,7 @@ class Page(object):
 				raise errors.ProtectedPageError(self, e.code, e.info)
 			else:
 				raise
+		return result['edit']
 
 	def get_expanded(self):
 		self.site.require(1, 12)