First run fixes