Small fixes.

Change-Id: Ib05fd84d5182a7e546e297269699d18b2b93ef6a
Merge pull request #1 from saelo/cm-10.1

Small fixes.