Addressed @tamiko and @guidokanschat comments on configs.