Small fixes / py3k

Closed Bitbucket Importer requested to merge bitbucket/declined-pr-53 into branch/py3k