Fix cart cleanup and cart unlock