Fixes for S2.3+ Compatibility

Couldn't get this to work under S2.3.1 - So I added some missing fixes according to the Migration Guidelines for S2.3... it's working fine now.