Vda decoding fixups

Simplify vda decoding logic and resolve part of the queuing issues.