Better wording, port fix