Small shuffle playlist fixes/enhancements