Fix bug with onRenderCollection call

Fixes #1503 
Fixes #1506
Fixes #1504
Fair, but unrelated refactor tho