Changes for Python 3.4