Get rid of some overridden values