Fixes to new javascript, bundling