Some bundling fixes