Fixed up play and shuffle command handling