Small fixes.

Change-Id: Id33e19c168565853bef51ef2e6aac3623b1e15ce