OAK-1965: Fix 1.0 compile issues.