Moving code to ARC
Fixes