Minor fix, where trailing items could get missed in setup utilities