A couple language tweaks after the last merge