Fixed issues with webooks