Fixes on class_cart