fixes

Change-Id: If49371d75f0227b9e5a02c0f455f7bd609028f41