Variant - aligment-related fixes