Fixing 2to3 common warnings