Some fixes to JBundler support.