Compatibility fixes with SDK 1.15
fixes #105
fixes #107