Shopping cart fixes