Some minor compatibility changes for ST2 support