More carousel fixes