resource collection fixes