JAL-3248 small edits