Some minor python 3.3 compatibility changes