Fixes for latest sdk changes.