Fixes to make HMAC-SHA1 work