Fixed variant builds