fixing build errors and spec run errors.
make the webhook specs pass