2 bag fixes