Fixes less compilation, adds new bundles