Fix config problems