Fixes requested by ArnaudBienner.
Merge pull request #4495 from gavinhoward/playlist_save

Playlist Save Fixes