Fix for av_bkp and some comments