Nitpicks

Change-Id: If8ce155246beb5395d81db8ab432046181b6d97f