bug fixes

Change-Id: I94e78cae3ef6b8ab3d1293343bd6fc315f7c1a9f