Minor type changes