Fixup some resume playback bugs