Fixed infrastructure errors.