Don't match adtec this time round and do length/payload recovery properly