Add some python 3 compatibility