final fixes

Change-Id: Ia615cbf9b44b08bd88a5d9d2ca266ce37976c021