Fix cart controllers & events