Some fixes and updated bundles