Add a little more startup logic