Minor bug fixes based to configuration values and strings

EV-191