Minor normalization changes