Fixes from additions.

Change-Id: I5a469c4cd7de9cd9375b4f7fcd691b0f9a7003b6