bug fixes

Change-Id: Idddf8afbb82cf178a69f3677472431041f4bd0de