last minute changes

Change-Id: I5142a696eb2881d8d3dc7e1d1f9bdc3ca503d9f1