Follow up to 89ef868 to fix compile issues.