Resolve some dependency problems with SDK features