diff --git a/ChangeLog b/ChangeLog
index 074f5d6b1..694841d3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2009-01-01  W. Tell  <w_tell -at- sourceforge>
 
 	* S3/S3.py, S3/Utils.py: Use 'hashlib' instead of md5 and sha 
-	  modules to avoid Python 2.6 warnings. 
+	  modules to avoid Python 2.6 warnings.
 
 2008-12-31  Michal Ludvig  <michal@logix.cz>
 
diff --git a/S3/S3.py b/S3/S3.py
index 2bfdc5d8c..ced37c023 100644
--- a/S3/S3.py
+++ b/S3/S3.py
@@ -17,7 +17,7 @@
 	from hashlib import md5, sha1
 except ImportError:
 	from md5 import md5
-	from sha import sha as sha1
+	import sha as sha1
 import hmac
 
 from Utils import *
diff --git a/s3cmd b/s3cmd
index 5f125c8b8..f8c2af09b 100755
--- a/s3cmd
+++ b/s3cmd
@@ -768,14 +768,14 @@ def cmd_sync_local2remote(src, dst):
 				except KeyError:
 					attr = "uid"
 					val = st.st_uid
-					warning(u"%s: Owner username not known. Storing UID=%d instead." % (src, val))
+					warning(u"%s: Owner username not known. Storing UID=%d instead." % (unicodise(src), val))
 			elif attr == 'gname':
 				try:
 					val = grp.getgrgid(st.st_gid).gr_name
 				except KeyError:
 					attr = "gid"
 					val = st.st_gid
-					warning(u"%s: Owner groupname not known. Storing GID=%d instead." % (src, val))
+					warning(u"%s: Owner groupname not known. Storing GID=%d instead." % (unicodise(src), val))
 			else:
 				val = getattr(st, 'st_' + attr)
 			attrs[attr] = val