Bug fixes for Corporate events app