Fix setup entries to match number of sections