Fix arc crashes