Fix a few issues that show up with python 3.4b1