Fixed some of the first-run stuff to account for the removal of clips.