A few more type changes