Small improvements to Configuration class