Attempt to fix compile errors found by others.

Unable to reproduce errors on my system, possibly due to older version of Java on other system...