Fixes.

Change-Id: Ida52286eade4e7ddf0080735a381af1d15d43b47