Fix Python-3 compatibility bugs