More type changes