Fix a couple of issues with ARC compilation