Fixes for Py3.3