FIX various python 3 compat fixes