Add CONFIG_FATAL variables
Change to use CONFIG_FATAL variables