Fix bundling and change publish options