Fix issues on first run