Other fixes

Now basket works correctly