Fix ARC support