[config] Minor fixes