Bugfix wrapping fees / Override Cart error