Enhancements to first steps.