Misc changes related to configuration