Fixing bundle issues