Adapt frozen potential and wrapping to 2d / 3d handling