Some last changes

Change-Id: Id222b52f8e7c12cbd08f36f47a2b69d3e85b70de