Some fixes in Carousel

Some fixes in Carousel