Nursery availability fixes