Minor tweaks and just empty EV collector