try to fix up overrides