Fix javadoc problems that make build fail