Minor fixes. Config