More fixes for SDK 1.1