Further type changes