Fixed build issues with latest sdk, including bundle dependency.