Some minor normalizations