DEP-22 carousel and other fixes