Fix bug with collection events before render

Fixes #1797 
Fixes #1794
:shrug: I'd rather see both changed in this PR.