Fix for _ bug and javadoc build error.