Fixed bundling issues.