Fixing some issues with random play.