Webhook fixes

This pull request serves to coordinate development on fixing the current issues with the webhooks. It should not be merged yet at this time.