Fix last errors
Add/remove bundles