Minor fixes. Improves mapping code for retrieving config settings by string