Compatibility fixes with SDK 1.15