more non-ARC build fixes