More compatibility fixes

Tested working under ST2 now.