Final fixes in variants