Minor changes to config system