Fixes to carousel and draw utils