Fix bundling and minification