Minor type warning corrections