variant fixes