More Python 2.7 compatibility