diff --git a/mwclient/page_nowriteapi.py b/mwclient/page_nowriteapi.py
index 109dccfc9eb13ea2b15eddfb8f7b1b468ef8e145..60e85ca3f2314e0657bf9615aca7eba0a85060ca 100644
--- a/mwclient/page_nowriteapi.py
+++ b/mwclient/page_nowriteapi.py
@@ -12,10 +12,14 @@ class OldPage(object):
 		data['wpSummary'] = summary
 		data['wpSave'] = 'Save page'
 		data['wpEditToken'] = self.get_token('edit')
-		if self.edit_time:
-			data['wpEdittime'] = time.strftime('%Y%m%d%H%M%S', self.edit_time)
+		if self.last_rev_time:
+			data['wpEdittime'] = time.strftime('%Y%m%d%H%M%S', self.last_rev_time)
 		else:
 			data['wpEdittime'] = time.strftime('%Y%m%d%H%M%S', time.gmtime())
+		if self.edit_time:
+			data['wpStarttime'] = time.strftime('%Y%m%d%H%M%S', self.edit_time)
+		else:
+			data['wpStarttime'] = time.strftime('%Y%m%d%H%M%S', time.gmtime())
 		data['wpStarttime'] = time.strftime('%Y%m%d%H%M%S', time.gmtime())
 
 		if minor: data['wpMinoredit'] = '1'
diff --git a/mwclient/upload.py b/mwclient/upload.py
index eacd25b07f4671def1ca9ed16a40e8a0c07554e6..77403f5bf1422d1bad70d6ee5c388fb25981f159 100644
--- a/mwclient/upload.py
+++ b/mwclient/upload.py
@@ -84,11 +84,11 @@ class UploadFile(Upload):
 		elif self.stage != self.STAGE_FILE:	
 			if self.str_data is None:
 				if self.stage == self.STAGE_FILEHEADER:
-				  	self.str_data = StringIO(self.fileheader)
+					self.str_data = StringIO(self.fileheader)
 				elif self.stage == self.STAGE_POSTDATA:
-				  	self.str_data = StringIO(self.postdata)
-			  	elif self.stage == self.STAGE_FOOTER:
-			  		self.str_data = StringIO(self.footer)
+					self.str_data = StringIO(self.postdata)
+				elif self.stage == self.STAGE_FOOTER:
+					self.str_data = StringIO(self.footer)
 			data = self.str_data.read(length)
 		else:
 			if self.length_left: