Saving playback state fixes