Fixes for event views