Fix up some Hawk auth stuff