some fixes for variant type indirection