Shelf Management fixes