Minor type cleanup