Fixes on cart and models