Cart fix + versioning