Updates to support Python 3.2