SongReader/VideoReader fixes