Fix some Python 2.7 problems