Clarifications for some 1.11 issues