Prepare to proper Python3 migration