Changes for non-ARC