Carousel general fixes