fixed ARC code issues