Fixes for sdk target.