Minor NormalGenerator touch-ups