fixed some errors

Change-Id: Iddc45d046b7d1794867040af4a22798a5f193977