Simple normalization fixes.