Cart issue fixes