FIX: Fix configurations