Fix some startup options being reset