FIXED: ivars warning fixes