Fixed a few bugs with new config system

Should work the exact same as it did before now.