Add and fix some missing steps.