Small changes to first_run