SHA-2 fixes and add-ons