A tweak was needed to previous submit, and in the interim another security bug came in, so fix that as well.