Merge "Minor edits in javafuzz"