Fix some normalization stuff.