Fix up random_song