Fixed issues with user accessible events.