Slight adjustments

Change-Id: I0f705f75bf1d2107294e2bdaa15705ffea4c8c7e