Fixes for VariantHeader