Added some fixes for carousel mode