Switch around a couple manager events for before config load and before validate
Switch config pre-check to run only with check command