Playlist Save Fixes

@ArnaudBienner saw some more problems with my patch. This pull request fixes them.