Fixes for Python-3.3