Fix IB warning.
Fix remaining IB warning.