Fix for SDK breaking changes