More fixes in configurations