[#20] Minor confiuration tweaks