Fix to overlooked bugs with the new config system