Small fixes.

Change-Id: I4f03e859795a9afb7850c45fa317ca82b89c7ec9