Fix handling of optional configuration settings