Fixes for errors when user skips to near the end of a track and another track is queued