Java S3: review fixes