Some bag fixes