+ fixes for changes to split events and metadata