Fix #39 - First run stuff