Events and callout fixes