fix up overrides stuff