Updated dangling type references