Final adjustments

Change-Id: I73f821e05fc7a7f90792f136f00cd5e6e9e6ee16