Fixed small bugs with configuration.