Add workarounds for sdk#33459 (#92)

2 files changed