fixes

Change-Id: Ie854ae0f1c9468bf0210286c037a95514a4b22b8