Updates for ARC and to fix some compilation warnings.