Fixed a few flaws in first-run.sh