More fixes on carousel