Small improvements before collection