Fixup post-merge stuff (could've sworn I committed these two already)

Fixes issue with init_db dependency chain being weird.

Add event_name and organization_name back in