Add some normalizations