Minor changes with normalization