Typo fix
Re-arrange order that defaults are set, only setup defaults for daemon when we daemonize