Fixed bundling issues