Bag fixes