Fixes for Python 3.4