A couple of syntax/wording changes