Javadoc + import fixes to make it compilable with JDK 1.8