Move some overrides