Make initial fixes

Change-Id: Ib55171e5f45962bab0cef2c7deaba0f01f3dd05f