Fixes to play and queue