Fix up last remaining steps.