Minor type resolution improvements