Clean up some code and JavaDoc warnings, fix build on JDK8

Various cleanups, fixes JDK8 build