Fix python 3
Fix minor things