Fixed a couple of bugs in configuration.