Proper fixes for supporting python 2 & 3 - In preparation for ST3 support!