Fix a bad merge with /etc/rc and the first startup changes