queue & player fixes