Java S3: more review fixes