Bundling fixes + string change