Fix hawk response header edge cases

Closes #720 #728