Minor type and layout updates