Minor changes to configuration framework