Resolve types before handling overrides