Fixes to carousel