Improve Python 3 compatibility