Ensure proper stuff gets bundled.