Changes after review.
Java fixes.