Minor improvements to config system