collect plugin fixes