Add in some missing items and indexes.