Tweaks to fix bundle issues