missed a few 2.1.2 changes