Fix infrastructure