Updates for ST3 / Python 3