Rework tweakscale patch