Various fix for playlist mode