Normalization bug fixes