Fix warnings
Javadoc improvements