Fix cart security issues