Some fixes to Python 2 and 3 compatibility post