Variant and TlbImp Fix

Small fixes to answer support calls