Fixed some stuff with firstRun