Minor type changes, cleanup