V13 multiple fixes