Normalization fixups