Fix boxes checkout and returns