Fix bugs

Change-Id: I4d94b15c43aab18301c9ab5f757e7ecfc3bbf85a
3 files changed