More fixes for playlist handling