Fix compiler infrastructure errors