Fix dependency issues in the bundle