Addtional python3 porting