bug fixes

Change-Id: I9611e12305c9d1103c4723a189f1c29a9ca9eccf