Fixed some issues with configuration.