First run bug fixes