Fixed config, more config validation.