Fix regressions from JAVA-84

JAVA-90 #fixes