Fixes for SDK setup