Fix bundle issues