Some errors corrected

Change-Id: Icfb4373d9cb9b90f88d5a3569eae53b41c0be15e