Fix Problems

Change-Id: I9acc8988946b9c90573a9e5fe5beeb698fefb4b1