Fixed carousel issues