manual corrections after 2to3