[CLC-1695] Fix boneheaded mistakes