Fixed bundle issues.