more tweaking to avoid warnings while bundling